aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_batchbuffer.c
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2013-07-03 14:29:56 -0700
committerKenneth Graunke <[email protected]>2013-07-09 14:09:13 -0700
commit7c3180a4ade0ccb37f51d59032c37f0f4b4cb144 (patch)
treeb43a0af61fc652db1b8bb17cbef6afc5ba135712 /src/mesa/drivers/dri/i965/intel_batchbuffer.c
parent5314afa27aa8d9260ed0b0a42a6d6050313953da (diff)
i965: Move intel_context::no_batch_wrap to brw_context.
Signed-off-by: Kenneth Graunke <[email protected]> Acked-by: Chris Forbes <[email protected]> Acked-by: Paul Berry <[email protected]> Acked-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_batchbuffer.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_batchbuffer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 0905237aa89..df83e3d6954 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -235,7 +235,6 @@ int
_intel_batchbuffer_flush(struct brw_context *brw,
const char *file, int line)
{
- struct intel_context *intel = &brw->intel;
int ret;
if (brw->batch.used == 0)
@@ -265,7 +264,7 @@ _intel_batchbuffer_flush(struct brw_context *brw,
intel_upload_finish(brw);
/* Check that we didn't just wrap our batchbuffer at a bad time. */
- assert(!intel->no_batch_wrap);
+ assert(!brw->no_batch_wrap);
ret = do_flush_locked(brw);