We now get everything we need from the gl_program param. --- 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 59de383..44c4960 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6579,7 +6579,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, @@ -6645,7 +6644,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, @@ -6660,7 +6659,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, @@ -6676,7 +6675,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, @@ -6692,7 +6691,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, @@ -6710,7 +6709,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, @@ -6725,7 +6724,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.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev