Module: Mesa Branch: staging/22.0 Commit: a90ab0038fa71c5c9f9251c9c5331e7c994490eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a90ab0038fa71c5c9f9251c9c5331e7c994490eb
Author: Mike Blumenkrantz <[email protected]> Date: Thu Apr 14 14:28:43 2022 -0400 zink: fix semantics mask for compute control barriers cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> 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 4a335d57c08..1b4a6542c42 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -36,7 +36,7 @@ "description": "zink: fix semantics mask for compute control barriers", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "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 a7b34628b3b..4845a9c8a3d 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 @@ -2751,7 +2751,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;
