Mesa (master): i965: Move MI_BATCHBUFFER_END handling into brw_finish_batch().
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Sep 21 16:37:34 UTC 2017
Module: Mesa
Branch: master
Commit: 5a746021ce786cc9ad450ddfce587ae24060eec0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a746021ce786cc9ad450ddfce587ae24060eec0
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Sep 18 10:00:48 2017 -0700
i965: Move MI_BATCHBUFFER_END handling into brw_finish_batch().
This is, by definition, finishing the batch.
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
---
src/mesa/drivers/dri/i965/intel_batchbuffer.c | 14 +++++++-------
1 file 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 6a16771fc6..216b0276c3 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. */
More information about the mesa-commit
mailing list