fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/blorp: Make blorp_addres::buffer a void*

Browse source 
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>
This commit is contained in:
Jason Ekstrand 2016-08-19 01:42:31 -07:00
parent 2191f5cb7e
commit 71dc2e0106
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/blorp.h
View file

@ -28,7 +28,6 @@
#include "isl/isl.h" #include "isl/isl.h"
#include "intel_resolve_map.h" /* needed for enum gen6_hiz_op */ #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_context;
struct brw_wm_prog_key; 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); void blorp_batch_finish(struct blorp_batch *batch);
struct blorp_address { struct blorp_address {
drm_intel_bo *buffer; void *buffer;
uint32_t read_domains; uint32_t read_domains;
uint32_t write_domain; uint32_t write_domain;
uint32_t offset; uint32_t offset;

5
src/mesa/drivers/dri/i965/genX_blorp_exec.c
View file

@ -73,12 +73,13 @@ blorp_surface_reloc(struct blorp_batch *batch, uint32_t ss_offset,
{ {
assert(batch->blorp->driver_ctx == batch->driver_batch); assert(batch->blorp->driver_ctx == batch->driver_batch);
struct brw_context *brw = 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, 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); 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; void *reloc_ptr = (void *)brw->batch.map + ss_offset;
#if GEN_GEN >= 8 #if GEN_GEN >= 8
*(uint64_t *)reloc_ptr = reloc_val; *(uint64_t *)reloc_ptr = reloc_val;