Mesa (main): zink: redo streamout and texture components of memory_barrier hook

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6fbcf335c259db8fd4900e72defdaf12c88b5626
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fbcf335c259db8fd4900e72defdaf12c88b5626

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon May 17 19:03:08 2021 -0400

zink: redo streamout and texture components of memory_barrier hook

this is more consolidated (and legal)

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11748>

---

 src/gallium/drivers/zink/zink_context.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index c728a2816e9..bd95fd6edf6 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2787,20 +2787,14 @@ zink_memory_barrier(struct pipe_context *pctx, unsigned flags)
                   VK_ACCESS_SHADER_WRITE_BIT,
                   VK_ACCESS_INDIRECT_COMMAND_READ_BIT);
 
-   if (flags & PIPE_BARRIER_FRAMEBUFFER) {
-      mem_barrier(batch, all_flags, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-                  VK_ACCESS_SHADER_WRITE_BIT,
-                  VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT);
-      mem_barrier(batch, all_flags, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
-                  VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-                  VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT);
-   }
+   if (flags & PIPE_BARRIER_FRAMEBUFFER)
+      zink_texture_barrier(pctx, 0);
    if (flags & PIPE_BARRIER_STREAMOUT_BUFFER)
       mem_barrier(batch, all_flags,
                   VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT | VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT,
+                  VK_ACCESS_SHADER_WRITE_BIT,
                   VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT |
-                  VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
-                  VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT);
+                  VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT);
 }
 
 static void