[Mesa-dev] [PATCH 26/53] st/mesa: stop passing gl_linked_shader to set_affected_state_flags()

[Timothy Arceri]

We now get everything we need from the gl_program param.

Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp 
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 543256c..11ec352 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -6600,7 +6600,6 @@ get_mesa_program_tgsi(struct gl_context *ctx,
 static void
 set_affected_state_flags(uint64_t *states,
                          struct gl_program *prog,
-                         struct gl_linked_shader *shader,
                          uint64_t new_constants,
                          uint64_t new_sampler_views,
                          uint64_t new_samplers,
@@ -6666,7 +6665,7 @@ get_mesa_program(struct gl_context *ctx,
                    ST_NEW_RASTERIZER |
                    ST_NEW_VERTEX_ARRAYS;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_VS_CONSTANTS,
                                   ST_NEW_VS_SAMPLER_VIEWS,
                                   ST_NEW_RENDER_SAMPLERS,
@@ -6681,7 +6680,7 @@ get_mesa_program(struct gl_context *ctx,
 
          *states = ST_NEW_TCS_STATE;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_TCS_CONSTANTS,
                                   ST_NEW_TCS_SAMPLER_VIEWS,
                                   ST_NEW_RENDER_SAMPLERS,
@@ -6697,7 +6696,7 @@ get_mesa_program(struct gl_context *ctx,
          *states = ST_NEW_TES_STATE |
                    ST_NEW_RASTERIZER;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_TES_CONSTANTS,
                                   ST_NEW_TES_SAMPLER_VIEWS,
                                   ST_NEW_RENDER_SAMPLERS,
@@ -6713,7 +6712,7 @@ get_mesa_program(struct gl_context *ctx,
          *states = ST_NEW_GS_STATE |
                    ST_NEW_RASTERIZER;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_GS_CONSTANTS,
                                   ST_NEW_GS_SAMPLER_VIEWS,
                                   ST_NEW_RENDER_SAMPLERS,
@@ -6731,7 +6730,7 @@ get_mesa_program(struct gl_context *ctx,
                    ST_NEW_SAMPLE_SHADING |
                    ST_NEW_FS_CONSTANTS;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_FS_CONSTANTS,
                                   ST_NEW_FS_SAMPLER_VIEWS,
                                   ST_NEW_RENDER_SAMPLERS,
@@ -6746,7 +6745,7 @@ get_mesa_program(struct gl_context *ctx,
 
          *states = ST_NEW_CS_STATE;
 
-         set_affected_state_flags(states, prog, shader,
+         set_affected_state_flags(states, prog,
                                   ST_NEW_CS_CONSTANTS,
                                   ST_NEW_CS_SAMPLER_VIEWS,
                                   ST_NEW_CS_SAMPLERS,
-- 
2.9.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev