From: keithw <keithw@keithw-laptop.(none)>
Date: Fri, 24 Aug 2007 09:15:06 +0000 (+0100)
Subject: have to check I915_HW_SAMPLER when emitting MAP state, because of sampler_enable_flags.
X-Git-Tag: 062012170305~17580^2~390^2~4172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a1027cd4098c25dc59be889f4d00cdb47550b44;p=profile%2Fivi%2Fmesa.git

have to check I915_HW_SAMPLER when emitting MAP state, because of sampler_enable_flags.
---

diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/mesa/pipe/i915simple/i915_state_emit.c
index 48eb860..4804b0c 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;