diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-28 09:35:20 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-05-02 17:01:40 -0700 |
| commit | 02a34497581b768588db334fe294a43134d6fb82 (patch) | |
| tree | 384ca0a7b9bd2b9da9cde4c035a85aada2d43efb | |
| parent | 57ad5a31031feecdc64a81750df996740e3e9954 (diff) | |
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 <kenneth@whitecape.org>
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_wm_state.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_state.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_ps_state.c | 1 |
3 files changed, 0 insertions, 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 b85c1466c8e..742a52e8f9d 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 97831dfeb52..eabadee3bf9 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 8d9ad643e86..085606072bd 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; |