summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/intel_batchbuffer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 6a16771fc6d..216b0276c3d 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -665,6 +665,13 @@ brw_finish_batch(struct brw_context *brw)
PIPE_CONTROL_CS_STALL);
}
}
+
+ /* Mark the end of the buffer. */
+ intel_batchbuffer_emit_dword(&brw->batch, MI_BATCH_BUFFER_END);
+ if (USED_BATCH(brw->batch) & 1) {
+ /* Round batchbuffer usage to 2 DWORDs. */
+ intel_batchbuffer_emit_dword(&brw->batch, MI_NOOP);
+ }
}
static void
@@ -899,13 +906,6 @@ _intel_batchbuffer_flush_fence(struct brw_context *brw,
brw_finish_batch(brw);
- /* Mark the end of the buffer. */
- intel_batchbuffer_emit_dword(&brw->batch, MI_BATCH_BUFFER_END);
- if (USED_BATCH(brw->batch) & 1) {
- /* Round batchbuffer usage to 2 DWORDs. */
- intel_batchbuffer_emit_dword(&brw->batch, MI_NOOP);
- }
-
intel_upload_finish(brw);
/* Check that we didn't just wrap our batchbuffer at a bad time. */