diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-03 14:21:19 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:09:08 -0700 |
commit | 329779a0b45b63be17627f026533c80b2c8f7991 (patch) | |
tree | 88ee98c79bdfdacaf50b53d7303caf2f1d63688b /src/mesa/drivers/dri/i965/brw_state_batch.c | |
parent | 5d8186ac1a22afbaa6ed68e0fb67d1f150f798cb (diff) | |
download | external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.zip external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.gz external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.bz2 |
i965: Move intel_context::batch to brw_context.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_batch.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_batch.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c index ea1fe81..c71d2f3 100644 --- a/src/mesa/drivers/dri/i965/brw_state_batch.c +++ b/src/mesa/drivers/dri/i965/brw_state_batch.c @@ -40,7 +40,7 @@ brw_track_state_batch(struct brw_context *brw, uint32_t offset, int size) { - struct intel_batchbuffer *batch = &brw->intel.batch; + struct intel_batchbuffer *batch = &brw->batch; if (!brw->state_batch_list) { /* Our structs are always aligned to at least 32 bytes, so @@ -81,13 +81,11 @@ make_annotation(drm_intel_aub_annotation *annotation, uint32_t type, void brw_annotate_aub(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - unsigned annotation_count = 2 * brw->state_batch_count + 1; drm_intel_aub_annotation annotations[annotation_count]; int a = 0; make_annotation(&annotations[a++], AUB_TRACE_TYPE_BATCH, 0, - 4*intel->batch.used); + 4*brw->batch.used); for (int i = brw->state_batch_count; i-- > 0; ) { uint32_t type = brw->state_batch_list[i].type; uint32_t start_offset = brw->state_batch_list[i].offset; @@ -98,7 +96,7 @@ brw_annotate_aub(struct brw_context *brw) AUB_TRACE_SUBTYPE(type), end_offset); } assert(a == annotation_count); - drm_intel_bufmgr_gem_set_aub_annotations(intel->batch.bo, annotations, + drm_intel_bufmgr_gem_set_aub_annotations(brw->batch.bo, annotations, annotation_count); } @@ -123,7 +121,7 @@ brw_state_batch(struct brw_context *brw, int alignment, uint32_t *out_offset) { - struct intel_batchbuffer *batch = &brw->intel.batch; + struct intel_batchbuffer *batch = &brw->batch; uint32_t offset; assert(size < batch->bo->size); |