summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_blit.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-07-03 14:21:19 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-07-09 14:09:08 -0700
commit329779a0b45b63be17627f026533c80b2c8f7991 (patch)
tree88ee98c79bdfdacaf50b53d7303caf2f1d63688b /src/mesa/drivers/dri/i965/intel_blit.c
parent5d8186ac1a22afbaa6ed68e0fb67d1f150f798cb (diff)
downloadexternal_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/intel_blit.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_blit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
index 7d57d6e..3d2181d 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -302,7 +302,7 @@ intelEmitCopyBlit(struct brw_context *brw,
/* do space check before going any further */
do {
- aper_array[0] = intel->batch.bo;
+ aper_array[0] = brw->batch.bo;
aper_array[1] = dst_buffer;
aper_array[2] = src_buffer;
@@ -537,7 +537,6 @@ intel_miptree_set_alpha_to_one(struct brw_context *brw,
struct intel_mipmap_tree *mt,
int x, int y, int width, int height)
{
- struct intel_context *intel = &brw->intel;
struct intel_region *region = mt->region;
uint32_t BR13, CMD;
int pitch, cpp;
@@ -561,7 +560,7 @@ intel_miptree_set_alpha_to_one(struct brw_context *brw,
BR13 |= pitch;
/* do space check before going any further */
- aper_array[0] = intel->batch.bo;
+ aper_array[0] = brw->batch.bo;
aper_array[1] = region->bo;
if (drm_intel_bufmgr_check_aperture_space(aper_array,