diff options
| author | Jason Ekstrand <[email protected]> | 2016-08-19 01:42:31 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-08-29 12:17:34 -0700 |
| commit | 71dc2e0106f4da2c697ec6ad23fc09e960a63bdf (patch) | |
| tree | f518d434ac31c59adf529ce68c9aa135cb76600d | |
| parent | 2191f5cb7ed3205f8110ca989e13ade517084171 (diff) | |
i965/blorp: Make blorp_addres::buffer a void*
The Vulkan driver doesn't use libdrm so we don't want to bake that in.
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/blorp.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_blorp_exec.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/blorp.h b/src/mesa/drivers/dri/i965/blorp.h index 0f0a14ef410..87867779d8d 100644 --- a/src/mesa/drivers/dri/i965/blorp.h +++ b/src/mesa/drivers/dri/i965/blorp.h @@ -28,7 +28,6 @@ #include "isl/isl.h" #include "intel_resolve_map.h" /* needed for enum gen6_hiz_op */ -#include "intel_bufmgr.h" /* needed for drm_intel_bo */ struct brw_context; struct brw_wm_prog_key; @@ -79,7 +78,7 @@ void blorp_batch_init(struct blorp_context *blorp, struct blorp_batch *batch, void blorp_batch_finish(struct blorp_batch *batch); struct blorp_address { - drm_intel_bo *buffer; + void *buffer; uint32_t read_domains; uint32_t write_domain; uint32_t offset; diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index a735f3b2a25..03c13b7bba1 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -73,12 +73,13 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset, { assert(batch->blorp->driver_ctx == batch->driver_batch); struct brw_context *brw = batch->driver_batch; + drm_intel_bo *bo = address.buffer; drm_intel_bo_emit_reloc(brw->batch.bo, ss_offset, - address.buffer, address.offset + delta, + bo, address.offset + delta, address.read_domains, address.write_domain); - uint64_t reloc_val = address.buffer->offset64 + address.offset + delta; + 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; |