diff options
| author | Eric Anholt <eric@anholt.net> | 2011-04-22 14:26:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-04-29 15:25:59 -0700 |
| commit | c108a3f863c44b5e9760d4668148ef8ca7557b2f (patch) | |
| tree | 0b3f1cda66b5df4330fdf90b50c5fdad817601c6 /src/mesa/drivers/dri/i965/gen6_cc.c | |
| parent | 35e8fe5c99b285f348cb8a1bba2931f120f7c0a1 (diff) | |
| download | external_mesa3d-c108a3f863c44b5e9760d4668148ef8ca7557b2f.zip external_mesa3d-c108a3f863c44b5e9760d4668148ef8ca7557b2f.tar.gz external_mesa3d-c108a3f863c44b5e9760d4668148ef8ca7557b2f.tar.bz2 | |
i965/gen6: Move the depth/stencil state to state streaming.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_cc.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_cc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index e4157b1..938f914 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -158,18 +158,13 @@ static void upload_cc_state_pointers(struct brw_context *brw) OUT_BATCH(_3DSTATE_CC_STATE_POINTERS << 16 | (4 - 2)); OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, brw->cc.blend_state_offset | 1); - OUT_RELOC(brw->cc.depth_stencil_state_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 1); + OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, + brw->cc.depth_stencil_state_offset | 1); OUT_RELOC(intel->batch.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, brw->cc.state_offset | 1); ADVANCE_BATCH(); } - -static void prepare_cc_state_pointers(struct brw_context *brw) -{ - brw_add_validated_bo(brw, brw->cc.depth_stencil_state_bo); -} - const struct brw_tracked_state gen6_cc_state_pointers = { .dirty = { .mesa = 0, @@ -178,6 +173,5 @@ const struct brw_tracked_state gen6_cc_state_pointers = { CACHE_NEW_COLOR_CALC_STATE | CACHE_NEW_DEPTH_STENCIL_STATE) }, - .prepare = prepare_cc_state_pointers, .emit = upload_cc_state_pointers, }; |