Mesa (master): softpipe: correct signature of get_compiler_options

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7a1346b26a70a9d6000f4889ab4d594a6a445d6d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a1346b26a70a9d6000f4889ab4d594a6a445d6d

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Nov 10 09:38:45 2020 +0100

softpipe: correct signature of get_compiler_options

This gets rid of a harmless but annoying compiler warning on MSVC.

Fixes: 73bafb5ee38 ("gallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7524>

---

 src/gallium/drivers/softpipe/sp_screen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 4219e9bd36f..43f57bbf081 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -89,7 +89,8 @@ static const nir_shader_compiler_options sp_compiler_options = {
 
 static const void *
 softpipe_get_compiler_options(struct pipe_screen *pscreen,
-                              enum pipe_shader_ir ir, unsigned shader)
+                              enum pipe_shader_ir ir,
+                              enum pipe_shader_type shader)
 {
    assert(ir == PIPE_SHADER_IR_NIR);
    return &sp_compiler_options;