Module: Mesa Branch: staging/22.0 Commit: 99c6b69a3e122d3d153a9abdca0277d0e41a0787 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99c6b69a3e122d3d153a9abdca0277d0e41a0787
Author: Mike Blumenkrantz <[email protected]> Date: Fri Apr 22 13:58:11 2022 -0400 zink: fix group memory barrier emission same as glslang cc: mesa-stable Reviewed-by: Daniel Schürmann <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16108> (cherry picked from commit ce02eeecf4930e38b4042c02ebf61bac2be19dd0) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7db4452e16f..6484c49e91f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -516,7 +516,7 @@ "description": "zink: fix group memory barrier emission", "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 4845a9c8a3d..7d7f77d3a26 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 @@ -2737,7 +2737,10 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr) case nir_intrinsic_group_memory_barrier: spirv_builder_emit_memory_barrier(&ctx->builder, SpvScopeWorkgroup, + SpvMemorySemanticsImageMemoryMask | + SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsWorkgroupMemoryMask | + SpvMemorySemanticsAtomicCounterMemoryMask | SpvMemorySemanticsAcquireReleaseMask); break;
