From: Eric Anholt <eric@anholt.net>
Date: Thu, 21 Jun 2007 21:14:24 +0000 (-0700)
Subject: Merge branch 'origin' into i915-unification
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fe48b4e8568896cdbc822323aeec0a41c72ff2a;p=mesa.git

Merge branch 'origin' into i915-unification
---

4fe48b4e8568896cdbc822323aeec0a41c72ff2a
diff --cc src/mesa/drivers/dri/i915tex/i830_vtbl.c
index 441dc660acb,e432648ada0..dc91af71815
--- a/src/mesa/drivers/dri/i915tex/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
@@@ -485,13 -487,16 +485,15 @@@ i830_emit_state(struct intel_context *i
           if (state->tex_buffer[i]) {
              OUT_RELOC(state->tex_buffer[i],
                        DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ,
 -                      DRM_BO_MASK_MEM | DRM_BO_FLAG_READ,
                        state->tex_offset[i] | TM0S0_USE_FENCE);
           }
-          else {
-             assert(i == 0);
-             assert(state == &i830->meta);
-             OUT_BATCH(0);
-          }
+ 	 else if (state == &i830->meta) {
+ 	    assert(i == 0);
+ 	    OUT_BATCH(0);
+ 	 }
+ 	 else {
+ 	    OUT_BATCH(state->tex_offset[i]);
+ 	 }
  
           OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S1]);
           OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S2]);