summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkeithw <keithw@keithw-laptop.(none)>2007-08-24 10:15:06 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2007-08-24 11:25:07 +0100
commit7a1027cd4098c25dc59be889f4d00cdb47550b44 (patch)
tree81365056aad9ad3fa84a207fe166a5de1091d8da /src
parentb4d8be235b018594a79258d36e70880ab9019b72 (diff)
have to check I915_HW_SAMPLER when emitting MAP state, because of sampler_enable_flags.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/i915simple/i915_state_emit.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/mesa/pipe/i915simple/i915_state_emit.c
index 48eb86091d..4804b0caee 100644
--- a/src/mesa/pipe/i915simple/i915_state_emit.c
+++ b/src/mesa/pipe/i915simple/i915_state_emit.c
@@ -192,8 +192,14 @@ i915_emit_hardware_state(struct i915_context *i915 )
#if 01
/* texture images */
- if (i915->hardware_dirty & I915_HW_MAP)
+ if (i915->hardware_dirty & (I915_HW_MAP | I915_HW_SAMPLER))
{
+ /* XXX: we were refering to sampler state
+ * (current.sampler_enable_nr) below, but only checking
+ * I915_HW_MAP above. Should probably calculate the enabled
+ * flags separately - but there will be further rework of
+ * state so perhaps not necessary yet.
+ */
const uint nr = i915->current.sampler_enable_nr;
if (nr) {
const uint enabled = i915->current.sampler_enable_flags;