Module: Mesa
Branch: master
Commit: dfeb61c5cfd39d2f9cc702d9a3151ea47a7540d8
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfeb61c5cfd39d2f9cc702d9a3151ea47a7540d8

Author: Marek Olšák <[email protected]>
Date:   Fri Jun  8 22:29:55 2018 -0400

radeonsi: ignore PIPE_RESOURCE_FLAG_MAP_COHERENT

We treat coherent and non-coherent buffers the same.

And move external_usage for better packing.

Tested-by: Dieter Nützel <[email protected]>

---

 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 0546fa9d33..5bd95bffc1 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 eb0c226ed7..5ff762296f 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 {

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to