diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_blorp_exec.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 15 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.h | 17 |
3 files changed, 18 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index a7d5bed85f7..bdbce589a63 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -55,10 +55,10 @@ blorp_emit_reloc(struct blorp_batch *batch, struct brw_context *brw = batch->driver_batch; uint32_t offset = (char *)location - (char *)brw->batch.map; - return intel_batchbuffer_reloc(&brw->batch, address.buffer, offset, - address.read_domains, - address.write_domain, - address.offset + delta); + return brw_emit_reloc(&brw->batch, offset, + address.buffer, address.offset + delta, + address.read_domains, + address.write_domain); } static void diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index c81ad3bb401..ff154cce1c5 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -580,16 +580,15 @@ _intel_batchbuffer_flush_fence(struct brw_context *brw, /* This is the only way buffers get added to the validate list. */ uint64_t -intel_batchbuffer_reloc(struct intel_batchbuffer *batch, - drm_bacon_bo *buffer, uint32_t offset, - uint32_t read_domains, uint32_t write_domain, - uint32_t delta) +brw_emit_reloc(struct intel_batchbuffer *batch, uint32_t batch_offset, + drm_bacon_bo *target, uint32_t target_offset, + uint32_t read_domains, uint32_t write_domain) { int ret; - ret = drm_bacon_bo_emit_reloc(batch->bo, offset, - buffer, delta, - read_domains, write_domain); + ret = drm_bacon_bo_emit_reloc(batch->bo, batch_offset, + target, target_offset, + read_domains, write_domain); assert(ret == 0); (void)ret; @@ -597,7 +596,7 @@ intel_batchbuffer_reloc(struct intel_batchbuffer *batch, * case the buffer doesn't move and we can short-circuit the relocation * processing in the kernel */ - return buffer->offset64 + delta; + return target->offset64 + target_offset; } void diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h index 61b4fef3e3c..d5f0fc025b7 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h @@ -65,12 +65,9 @@ void intel_batchbuffer_data(struct brw_context *brw, const void *data, GLuint bytes, enum brw_gpu_ring ring); -uint64_t intel_batchbuffer_reloc(struct intel_batchbuffer *batch, - drm_bacon_bo *buffer, - uint32_t offset, - uint32_t read_domains, - uint32_t write_domain, - uint32_t delta); +uint64_t brw_emit_reloc(struct intel_batchbuffer *batch, uint32_t batch_offset, + drm_bacon_bo *target, uint32_t target_offset, + uint32_t read_domains, uint32_t write_domain); #define USED_BATCH(batch) ((uintptr_t)((batch).map_next - (batch).map)) @@ -159,8 +156,8 @@ intel_batchbuffer_advance(struct brw_context *brw) #define OUT_RELOC(buf, read_domains, write_domain, delta) do { \ uint32_t __offset = (__map - brw->batch.map) * 4; \ uint32_t reloc = \ - intel_batchbuffer_reloc(&brw->batch, (buf), __offset, \ - (read_domains), (write_domain), (delta)); \ + brw_emit_reloc(&brw->batch, __offset, (buf), (delta), \ + (read_domains), (write_domain)); \ OUT_BATCH(reloc); \ } while (0) @@ -168,8 +165,8 @@ intel_batchbuffer_advance(struct brw_context *brw) #define OUT_RELOC64(buf, read_domains, write_domain, delta) do { \ uint32_t __offset = (__map - brw->batch.map) * 4; \ uint64_t reloc64 = \ - intel_batchbuffer_reloc(&brw->batch, (buf), __offset, \ - (read_domains), (write_domain), (delta)); \ + brw_emit_reloc(&brw->batch, __offset, (buf), (delta), \ + (read_domains), (write_domain)); \ OUT_BATCH(reloc64); \ OUT_BATCH(reloc64 >> 32); \ } while (0) |