The Vulkan driver doesn't use libdrm so we don't want to bake that in.
---
src/mesa/drivers/dri/i965/blorp.h | 3 +--
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 a6123b0..9fb0c6e 100644
--- a/src/mesa/drivers/dri/i965/blorp.h
+++ b/src/mesa/drivers/dri/i965/blorp.h
@@ -29,7 +29,6 @@
#include "c11/threads.h"
#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;
@@ -69,7 +68,7 @@ void blorp_init(struct blorp_context *blorp, void *driver_ctx,
void blorp_finish(struct blorp_context *blorp);
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 7390a1d..0d24066 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -70,12 +70,13 @@ blorp_surface_reloc(struct blorp_context *blorp, uint32_t
ss_offset,
struct blorp_address address, uint32_t delta)
{
struct brw_context *brw = blorp->driver_ctx;
+ 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;
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
