Mesa (staging/22.1): zink: fix semantics mask for compute control barriers

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 0776767b150193c5621a5c1c5b0a58cbe0b0558e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0776767b150193c5621a5c1c5b0a58cbe0b0558e

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr 14 14:28:43 2022 -0400

zink: fix semantics mask for compute control barriers

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15959>
(cherry picked from commit 5e931cd0e18e91d896d7cb428cbe6c4f142bc51b)

---

 .pick_status.json                                    | 2 +-
 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 82a1c6b7473..4e82dadb558 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -319,7 +319,7 @@
         "description": "zink: fix semantics mask for compute control barriers",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index b5b324a000e..7ed10731abd 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -2944,7 +2944,7 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr)
       if (ctx->stage == MESA_SHADER_COMPUTE)
          spirv_builder_emit_control_barrier(&ctx->builder, SpvScopeWorkgroup,
                                             SpvScopeWorkgroup,
-                                            SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsAcquireMask);
+                                            SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsAcquireReleaseMask);
       else
          spirv_builder_emit_control_barrier(&ctx->builder, SpvScopeWorkgroup, SpvScopeInvocation, 0);
       break;