diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-01-12 15:26:22 -0500 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-01-26 18:28:29 +0000 |
| commit | d3226c6e95bb7007e2ebef436e2bb2495806bd5c (patch) | |
| tree | 1bd263eea0645c69c4c3e778e2645ed338628d5e | |
| parent | e91c5034a748f1197c2f718664621a78cf4bb532 (diff) | |
zink: remove SpvMemorySemanticsMakeVisibleMask from nir_intrinsic_memory_barrier
this is invalid since vk memory model isn't used
cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14540>
(cherry picked from commit f0eb07f98fff0728b9693bf8f136c3edfe785922)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 9e08e0ef1e7..724d0ee8214 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4630,7 +4630,7 @@ "description": "zink: remove SpvMemorySemanticsMakeVisibleMask from nir_intrinsic_memory_barrier", "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 42dd8d07c99..e61a10743be 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 @@ -2869,7 +2869,7 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr) case nir_intrinsic_memory_barrier: spirv_builder_emit_memory_barrier(&ctx->builder, SpvScopeWorkgroup, SpvMemorySemanticsImageMemoryMask | SpvMemorySemanticsUniformMemoryMask | - SpvMemorySemanticsMakeVisibleMask | SpvMemorySemanticsAcquireReleaseMask); + SpvMemorySemanticsAcquireReleaseMask); break; case nir_intrinsic_memory_barrier_image: |