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 <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/blorp.h b/src/mesa/drivers/dri/i965/blorp.h
index 0f0a14ef41096b53ab859f8ac06e606b3a53573e..87867779d8d8721e1fe0af4760db45723fc92a6c 100644 (file)
--- 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 a735f3b2a25a1c0292832b88896786b5b7aae9a0..03c13b7bba145202f0c9f84becda6a724331d199 100644 (file)
--- 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;