summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2017-04-22 20:00:14 -0700
committerKenneth Graunke <kenneth@whitecape.org>2017-07-18 15:53:33 -0700
commitd9015b1eab66afd8c53cbd35e6e946e041848727 (patch)
tree2ce34eac1c20c1f6f8861b39532dcddcc2d6a1e2
parent77844406d56a62408ced3b996ff7c85880cdb4b6 (diff)
i965/blorp: Use the return value of brw_emit_reloc.
This guarantees that the value written in the batch matches the value recorded in the relocation entry. (Chris Wilson wrote an identical patch as well.)
-rw-r--r--src/mesa/drivers/dri/i965/genX_blorp_exec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index af3d60919d..c6eee4c5ae 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -73,10 +73,10 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset,
struct brw_context *brw = batch->driver_batch;
struct brw_bo *bo = address.buffer;
- brw_emit_reloc(&brw->batch, ss_offset, bo, address.offset + delta,
- address.read_domains, address.write_domain);
+ uint64_t reloc_val =
+ brw_emit_reloc(&brw->batch, ss_offset, bo, address.offset + delta,
+ address.read_domains, address.write_domain);
- uint64_t reloc_val = bo->offset64 + address.offset + delta;
void *reloc_ptr = (void *)brw->batch.map + ss_offset;
#if GEN_GEN >= 8
*(uint64_t *)reloc_ptr = reloc_val;