Module: Mesa Branch: staging/22.0 Commit: 580983bbf0b84cb4fd7f4b2364a29c605e6e81df URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=580983bbf0b84cb4fd7f4b2364a29c605e6e81df
Author: Mike Blumenkrantz <[email protected]> Date: Thu Apr 14 14:19:02 2022 -0400 zink: fix tcs control barriers for use without vk memory model these are translated into memory+control barriers in nir, and only the control barrier needs to be handled these semantics match what glslang does, so they must be right cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15959> (cherry picked from commit 55baf0c676a33a29aa8fb26e506e44eed598c091) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9bdcc28d49f..4a335d57c08 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -44,7 +44,7 @@ "description": "zink: fix tcs control barriers for use without vk memory model", "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 da291803ba3..a7b34628b3b 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 @@ -2720,8 +2720,7 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr) break; case nir_intrinsic_memory_barrier_tcs_patch: - spirv_builder_emit_memory_barrier(&ctx->builder, SpvScopeWorkgroup, - SpvMemorySemanticsOutputMemoryMask | SpvMemorySemanticsReleaseMask); + /* handled by subsequent nir_intrinsic_control_barrier */ break; case nir_intrinsic_memory_barrier: @@ -2749,9 +2748,12 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr) break; case nir_intrinsic_control_barrier: - spirv_builder_emit_control_barrier(&ctx->builder, SpvScopeWorkgroup, - SpvScopeWorkgroup, - SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsAcquireMask); + if (ctx->stage == MESA_SHADER_COMPUTE) + spirv_builder_emit_control_barrier(&ctx->builder, SpvScopeWorkgroup, + SpvScopeWorkgroup, + SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsAcquireMask); + else + spirv_builder_emit_control_barrier(&ctx->builder, SpvScopeWorkgroup, SpvScopeInvocation, 0); break; case nir_intrinsic_interp_deref_at_centroid:
