From 02a34497581b768588db334fe294a43134d6fb82 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 28 Apr 2014 09:35:20 -0700 Subject: [PATCH] i965: Drop a NEW_SAMPLER annotation for use of sampler_count. The sampler count is set up from the gl_program at draw time, not at sampler change time. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/gen6_wm_state.c | 1 - src/mesa/drivers/dri/i965/gen7_wm_state.c | 1 - src/mesa/drivers/dri/i965/gen8_ps_state.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index b85c146..742a52e 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -143,7 +143,6 @@ upload_wm_state(struct brw_context *brw) if (ctx->_Shader->CurrentProgram[MESA_SHADER_FRAGMENT] == NULL) dw2 |= GEN6_WM_FLOATING_POINT_MODE_ALT; - /* CACHE_NEW_SAMPLER */ dw2 |= (ALIGN(brw->wm.base.sampler_count, 4) / 4) << GEN6_WM_SAMPLER_COUNT_SHIFT; diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index 97831df..eabadee 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c @@ -154,7 +154,6 @@ upload_ps_state(struct brw_context *brw) dw2 = dw4 = dw5 = 0; - /* CACHE_NEW_SAMPLER */ dw2 |= (ALIGN(brw->wm.base.sampler_count, 4) / 4) << GEN7_PS_SAMPLER_COUNT_SHIFT; diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c b/src/mesa/drivers/dri/i965/gen8_ps_state.c index 8d9ad64..0856060 100644 --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c @@ -151,7 +151,6 @@ upload_ps_state(struct brw_context *brw) */ dw3 |= GEN7_PS_VECTOR_MASK_ENABLE; - /* CACHE_NEW_SAMPLER */ dw3 |= (ALIGN(brw->wm.base.sampler_count, 4) / 4) << GEN7_PS_SAMPLER_COUNT_SHIFT; -- 2.7.4