diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-14 14:19:02 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-22 09:00:44 -0700 |
| commit | 5286bd22d8b576a1911d8a75cddbee0a81e057ab (patch) | |
| tree | 189de3e3725d4fc45ee68e7f1f1dab19dc1e6804 | |
| parent | de0c61c03bbdb1c7654a5bed1f69a3bf3ac68656 (diff) | |
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 <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15959>
(cherry picked from commit 55baf0c676a33a29aa8fb26e506e44eed598c091)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 900f6034816..82a1c6b7473 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -328,7 +328,7 @@ "description": "zink: fix tcs control barriers for use without vk memory model", "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 badb02b795f..b5b324a000e 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 @@ -2913,8 +2913,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: @@ -2942,9 +2941,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: |