[Mesa-dev] [PATCH 10/14] gallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()

Brian Paul brianp at vmware.com
Tue Mar 7 02:08:13 UTC 2017


---
 src/gallium/drivers/vc4/vc4_program.c | 3 ++-
 src/gallium/drivers/vc4/vc4_screen.h  | 3 ++-
 src/gallium/include/pipe/p_screen.h   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 2175343..3d45723 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -2197,7 +2197,8 @@ static const nir_shader_compiler_options nir_options = {
 
 const void *
 vc4_screen_get_compiler_options(struct pipe_screen *pscreen,
-                                enum pipe_shader_ir ir, unsigned shader)
+                                enum pipe_shader_ir ir,
+                                enum pipe_shader_type shader)
 {
         return &nir_options;
 }
diff --git a/src/gallium/drivers/vc4/vc4_screen.h b/src/gallium/drivers/vc4/vc4_screen.h
index 1f91ad3..5205772 100644
--- a/src/gallium/drivers/vc4/vc4_screen.h
+++ b/src/gallium/drivers/vc4/vc4_screen.h
@@ -112,7 +112,8 @@ vc4_screen_bo_from_handle(struct pipe_screen *pscreen,
 
 const void *
 vc4_screen_get_compiler_options(struct pipe_screen *pscreen,
-                                enum pipe_shader_ir ir, unsigned shader);
+                                enum pipe_shader_ir ir,
+                                enum pipe_shader_type shader);
 
 extern uint32_t vc4_debug;
 
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 1606c2d..8b4239c 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -319,7 +319,7 @@ struct pipe_screen {
     */
    const void *(*get_compiler_options)(struct pipe_screen *screen,
                                       enum pipe_shader_ir ir,
-                                      unsigned shader);
+                                      enum pipe_shader_type shader);
 
    /**
     * Returns a pointer to a driver-specific on-disk shader cache. If the
-- 
1.9.1



More information about the mesa-dev mailing list