summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_state_dump.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2011-04-22 14:07:30 -0700
committerEric Anholt <eric@anholt.net>2011-04-29 15:25:54 -0700
commit35e8fe5c99b285f348cb8a1bba2931f120f7c0a1 (patch)
tree1228940d99c265644b594269306d98ced8a39a8b /src/mesa/drivers/dri/i965/brw_state_dump.c
parent2ee1fd2e8f023853b60c242ce7f83a595c0f65ff (diff)
i965/gen6: Move the blend 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.c12
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 69adb32c51f..d1df1486ced 100644
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -324,22 +324,20 @@ static void dump_cc_state(struct brw_context *brw)
static void dump_blend_state(struct brw_context *brw)
{
+ struct intel_context *intel = &brw->intel;
const char *name = "BLEND";
struct gen6_blend_state *blend;
uint32_t blend_off;
- if (brw->cc.blend_state_bo == NULL)
- return;
-
- drm_intel_bo_map(brw->cc.blend_state_bo, GL_FALSE);
+ drm_intel_bo_map(intel->batch.bo, GL_FALSE);
- blend = brw->cc.blend_state_bo->virtual;
- blend_off = brw->cc.blend_state_bo->offset;
+ blend = intel->batch.bo->virtual + brw->cc.blend_state_offset;
+ blend_off = intel->batch.bo->offset + brw->cc.blend_state_offset;
state_out(name, blend, blend_off, 0, "\n");
state_out(name, blend, blend_off, 1, "\n");
- drm_intel_bo_unmap(brw->cc.blend_state_bo);
+ drm_intel_bo_unmap(intel->batch.bo);
}