summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2007-06-15 15:24:35 +0200
committerMichel Dänzer <[email protected]>2007-06-15 15:24:35 +0200
commit9cde7fb61dd26cd98a26dcb0a54197e8d28ac3be (patch)
treec9dc7a4c2498e673cb5ea9e32a1408f3bb572b95 /src
parentf6963f57d9d1e9bf630c05c1c89f188091b12fc5 (diff)
i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915tex/i830_vtbl.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915tex/i830_vtbl.c b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
index dd0670dec37..e432648ada0 100644
--- a/src/mesa/drivers/dri/i915tex/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
@@ -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]);