diff options
| author | Kenneth Graunke <[email protected]> | 2017-09-18 10:00:48 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-09-21 09:33:47 -0700 |
| commit | 5a746021ce786cc9ad450ddfce587ae24060eec0 (patch) | |
| tree | 2d3a800562e866947e1e93a74692f693d091c909 /src/mesa | |
| parent | 1f254360799376d024357484c662bb29113e27f3 (diff) | |
i965: Move MI_BATCHBUFFER_END handling into brw_finish_batch().
This is, by definition, finishing the batch.
Reviewed-by: Chris Wilson <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 14 |
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. */ |