diff options
| author | Eric Anholt <[email protected]> | 2010-02-25 16:25:17 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-02-25 18:36:44 -0800 |
| commit | 54ea39f768871eb10286b195e1cd77f757c99752 (patch) | |
| tree | 8a5c83f80bafdf3e58cc90b2319d97236f8dbd87 | |
| parent | 1d7aec053b061caef928cfffc786660603d5f14c (diff) | |
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.
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_scissor_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_viewport_state.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c index 641d8859b3a..f5d537b1cfb 100644 --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c @@ -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); diff --git a/src/mesa/drivers/dri/i965/gen6_scissor_state.c b/src/mesa/drivers/dri/i965/gen6_scissor_state.c index 2d36f0056d9..81ebbf4ddf3 100644 --- a/src/mesa/drivers/dri/i965/gen6_scissor_state.c +++ b/src/mesa/drivers/dri/i965/gen6_scissor_state.c @@ -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); diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c b/src/mesa/drivers/dri/i965/gen6_viewport_state.c index 13d2fc1b42b..df3cbfb2245 100644 --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c @@ -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); |