i965: Don't set a nonexistent enable bit in several SNB state pointers.

The modify bit is now usually in the instruction header.  The
exception is CC state pointers.
This commit is contained in:
Eric Anholt
2010-02-25 16:25:17 -08:00
parent 1d7aec053b
commit 54ea39f768
3 changed files with 5 additions and 5 deletions
@@ -47,7 +47,7 @@ upload_sampler_state_pointers(struct brw_context *brw)
OUT_BATCH(0); /* VS */
OUT_BATCH(0); /* GS */
if (brw->wm.sampler_bo)
OUT_RELOC(brw->wm.sampler_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
OUT_RELOC(brw->wm.sampler_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
else
OUT_BATCH(0);
@@ -85,7 +85,7 @@ static void upload_scissor_state_pointers(struct brw_context *brw)
BEGIN_BATCH(2);
OUT_BATCH(CMD_3D_SCISSOR_STATE_POINTERS << 16 | (2 - 2));
OUT_RELOC(brw->sf.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
OUT_RELOC(brw->sf.state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
ADVANCE_BATCH();
intel_batchbuffer_emit_mi_flush(intel->batch);
@@ -154,9 +154,9 @@ static void upload_viewport_state_pointers(struct brw_context *brw)
GEN6_CC_VIEWPORT_MODIFY |
GEN6_SF_VIEWPORT_MODIFY |
GEN6_CLIP_VIEWPORT_MODIFY);
OUT_RELOC(brw->clip.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
OUT_RELOC(brw->sf.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
OUT_RELOC(brw->cc.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1);
OUT_RELOC(brw->clip.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
OUT_RELOC(brw->sf.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
OUT_RELOC(brw->cc.vp_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
ADVANCE_BATCH();
intel_batchbuffer_emit_mi_flush(intel->batch);