AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: make intel_batchbuffer_emit_dword() take a batchbuffer as argument

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Iago Toral Quiroga
2017-01-02 16:28:55 +01:00
parent f03bac1fc7
commit 1daa31d8a8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/intel_batchbuffer.c
+3 -3
View File
@@ -119,7 +119,7 @@ intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz,
#ifdef DEBUG
assert(sz < BATCH_SZ - BATCH_RESERVED);
#endif
if (intel_batchbuffer_space(brw) < sz)
if (intel_batchbuffer_space(&brw->batch) < sz)
intel_batchbuffer_flush(brw);
enum brw_gpu_ring prev_ring = brw->batch.ring;
@@ -401,10 +401,10 @@ _intel_batchbuffer_flush(struct brw_context *brw,
brw_finish_batch(brw);
/* Mark the end of the buffer. */
intel_batchbuffer_emit_dword(brw, MI_BATCH_BUFFER_END);
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, MI_NOOP);
intel_batchbuffer_emit_dword(&brw->batch, MI_NOOP);
}
intel_upload_finish(brw);
src/mesa/drivers/dri/i965/intel_batchbuffer.h
+9 -9
View File
@@ -94,27 +94,27 @@ static inline uint32_t float_as_int(float f)
* work...
*/
static inline unsigned
intel_batchbuffer_space(struct brw_context *brw)
intel_batchbuffer_space(struct intel_batchbuffer *batch)
{
return (brw->batch.state_batch_offset - brw->batch.reserved_space)
- USED_BATCH(brw->batch) * 4;
return (batch->state_batch_offset - batch->reserved_space)
- USED_BATCH(*batch) * 4;
}
static inline void
intel_batchbuffer_emit_dword(struct brw_context *brw, GLuint dword)
intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch, GLuint dword)
{
#ifdef DEBUG
assert(intel_batchbuffer_space(brw) >= 4);
assert(intel_batchbuffer_space(batch) >= 4);
#endif
*brw->batch.map_next++ = dword;
assert(brw->batch.ring != UNKNOWN_RING);
*batch->map_next++ = dword;
assert(batch->ring != UNKNOWN_RING);
}
static inline void
intel_batchbuffer_emit_float(struct brw_context *brw, float f)
intel_batchbuffer_emit_float(struct intel_batchbuffer *batch, float f)
{
intel_batchbuffer_emit_dword(brw, float_as_int(f));
intel_batchbuffer_emit_dword(batch, float_as_int(f));
}
static inline void