Module: Mesa Branch: master Commit: 5db82e0c897da46867dec5886bae1607d3124abc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5db82e0c897da46867dec5886bae1607d3124abc
Author: Eric Anholt <e...@anholt.net> Date: Thu Jul 14 17:31:33 2016 -0700 vc4: Remove dead dirty_samplers field. We use a big VC4_DIRTY_FRAGTEX/VC4_DIRTY_VERTEX on the stage, instead. --- src/gallium/drivers/vc4/vc4_context.h | 1 - src/gallium/drivers/vc4/vc4_state.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index c271a95..a7c25a8 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -87,7 +87,6 @@ struct vc4_texture_stateobj { unsigned num_textures; struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS]; unsigned num_samplers; - unsigned dirty_samplers; }; struct vc4_shader_uniform_info { diff --git a/src/gallium/drivers/vc4/vc4_state.c b/src/gallium/drivers/vc4/vc4_state.c index 7aa3931..0912ca5 100644 --- a/src/gallium/drivers/vc4/vc4_state.c +++ b/src/gallium/drivers/vc4/vc4_state.c @@ -575,12 +575,10 @@ vc4_sampler_states_bind(struct pipe_context *pctx, if (hwcso[i]) new_nr = i + 1; stage_tex->samplers[i] = hwcso[i]; - stage_tex->dirty_samplers |= (1 << i); } for (; i < stage_tex->num_samplers; i++) { stage_tex->samplers[i] = NULL; - stage_tex->dirty_samplers |= (1 << i); } stage_tex->num_samplers = new_nr; @@ -676,12 +674,10 @@ vc4_set_sampler_views(struct pipe_context *pctx, unsigned shader, if (views[i]) new_nr = i + 1; pipe_sampler_view_reference(&stage_tex->textures[i], views[i]); - stage_tex->dirty_samplers |= (1 << i); } for (; i < stage_tex->num_textures; i++) { pipe_sampler_view_reference(&stage_tex->textures[i], NULL); - stage_tex->dirty_samplers |= (1 << i); } stage_tex->num_textures = new_nr; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit