From dfeb61c5cfd39d2f9cc702d9a3151ea47a7540d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 8 Jun 2018 22:29:55 -0400 Subject: [PATCH] radeonsi: ignore PIPE_RESOURCE_FLAG_MAP_COHERENT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We treat coherent and non-coherent buffers the same. And move external_usage for better packing. Tested-by: Dieter Nützel --- src/gallium/drivers/radeonsi/si_buffer.c | 3 +-- src/gallium/drivers/radeonsi/si_pipe.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index 0546fa9d336..5bd95bffc17 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -142,8 +142,7 @@ void si_init_resource_fields(struct si_screen *sscreen, } if (res->b.b.target == PIPE_BUFFER && - res->b.b.flags & (PIPE_RESOURCE_FLAG_MAP_PERSISTENT | - PIPE_RESOURCE_FLAG_MAP_COHERENT)) { + res->b.b.flags & PIPE_RESOURCE_FLAG_MAP_PERSISTENT) { /* Use GTT for all persistent mappings with older * kernels, because they didn't always flush the HDP * cache before CS execution. diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index eb0c226ed79..5ff762296fc 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -216,12 +216,12 @@ struct r600_resource { */ bool TC_L2_dirty; - /* Whether the resource has been exported via resource_get_handle. */ - unsigned external_usage; /* PIPE_HANDLE_USAGE_* */ - /* Whether this resource is referenced by bindless handles. */ bool texture_handle_allocated; bool image_handle_allocated; + + /* Whether the resource has been exported via resource_get_handle. */ + unsigned external_usage; /* PIPE_HANDLE_USAGE_* */ }; struct r600_transfer { -- 2.11.0