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/brw_state_dump.c | |
| parent | 35e8fe5c99b285f348cb8a1bba2931f120f7c0a1 (diff) | |
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/brw_state_dump.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_dump.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c index d1df1486ced..e47adf600a8 100644 --- a/src/mesa/drivers/dri/i965/brw_state_dump.c +++ b/src/mesa/drivers/dri/i965/brw_state_dump.c @@ -267,17 +267,15 @@ static void dump_cc_viewport_state(struct brw_context *brw) static void dump_depth_stencil_state(struct brw_context *brw) { + struct intel_context *intel = &brw->intel; const char *name = "DEPTH STENCIL"; struct gen6_depth_stencil_state *ds; uint32_t ds_off; - if (brw->cc.depth_stencil_state_bo == NULL) - return; - - drm_intel_bo_map(brw->cc.depth_stencil_state_bo, GL_FALSE); + drm_intel_bo_map(intel->batch.bo, GL_FALSE); - ds = brw->cc.depth_stencil_state_bo->virtual; - ds_off = brw->cc.depth_stencil_state_bo->offset; + ds = intel->batch.bo->virtual + brw->cc.depth_stencil_state_offset; + ds_off = intel->batch.bo->offset + brw->cc.depth_stencil_state_offset; state_out(name, ds, ds_off, 0, "stencil %sable, func %d, write %sable\n", ds->ds0.stencil_enable ? "en" : "dis", @@ -289,7 +287,7 @@ static void dump_depth_stencil_state(struct brw_context *brw) ds->ds2.depth_test_enable ? "en" : "dis", ds->ds2.depth_test_func, ds->ds2.depth_write_enable ? "en" : "dis"); - drm_intel_bo_unmap(brw->cc.depth_stencil_state_bo); + drm_intel_bo_unmap(intel->batch.bo); } static void dump_cc_state(struct brw_context *brw) |