diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-05 11:36:44 -0700 |
| commit | 3cf20ddbfc9d3a1dad4c058050595c54589257d3 (patch) | |
| tree | 57de53410bb0fb40979eed20d3c80d4c0ed68664 /src/mesa/drivers/dri/i915tex/i830_vtbl.c | |
| parent | 2ac17c68e2d64260168a54a275e839775828f534 (diff) | |
| parent | 4fe48b4e8568896cdbc822323aeec0a41c72ff2a (diff) | |
Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/i830_vtbl.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/i830_vtbl.c | 12 |
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 441dc660ac..dc91af7181 100644 --- a/src/mesa/drivers/dri/i915tex/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c @@ -487,11 +487,13 @@ i830_emit_state(struct intel_context *intel) DRM_BO_FLAG_MEM_TT | 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]); |