zink: fix memory_barrier intrinsic

matching glsang behavior here

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15959>
This commit is contained in:
Mike Blumenkrantz 2022-04-15 09:58:58 -04:00 committed by Marge Bot
parent 5a2acfeffb
commit 5e84335fb5

View file

@ -2917,8 +2917,12 @@ emit_intrinsic(struct ntv_context *ctx, nir_intrinsic_instr *intr)
break;
case nir_intrinsic_memory_barrier:
spirv_builder_emit_memory_barrier(&ctx->builder, SpvScopeWorkgroup,
SpvMemorySemanticsImageMemoryMask | SpvMemorySemanticsUniformMemoryMask |
spirv_builder_emit_memory_barrier(&ctx->builder,
ctx->sinfo->have_vulkan_memory_model ? SpvScopeQueueFamily : SpvScopeDevice,
SpvMemorySemanticsImageMemoryMask |
SpvMemorySemanticsUniformMemoryMask |
SpvMemorySemanticsWorkgroupMemoryMask |
SpvMemorySemanticsAtomicCounterMemoryMask |
SpvMemorySemanticsAcquireReleaseMask);
break;