i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
authorMichel Dänzer <michel@tungstengraphics.com>
Fri, 15 Jun 2007 13:24:35 +0000 (15:24 +0200)
committerMichel Dänzer <michel@tungstengraphics.com>
Fri, 15 Jun 2007 13:24:35 +0000 (15:24 +0200)
src/mesa/drivers/dri/i915tex/i830_vtbl.c

index dd0670dec37275e8d04fddc40d17ad4ae8c0e1e1..e432648ada09969d5328890630a63145edca6173 100644 (file)
@@ -490,11 +490,13 @@ i830_emit_state(struct intel_context *intel)
                       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]);