spirv: fix memory_barrier_tcs_patch emission
authorRhys Perry <pendingchaos02@gmail.com>
Fri, 28 Feb 2020 19:31:22 +0000 (19:31 +0000)
committerMarge Bot <eric+marge@anholt.net>
Tue, 3 Mar 2020 11:49:40 +0000 (11:49 +0000)
Shouldn't affect any driver, since all currently implement
memory_barrier_tcs_patch as a no-op. It also looks like optimizations are
fine

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4003>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4003>

src/compiler/spirv/spirv_to_nir.c

index 9403a314b52c705ae2e5ae91257e0f2423788b1e..61abc7272783926fc14aaa30af530a419a9d7946 100644 (file)
@@ -3585,7 +3585,8 @@ vtn_emit_memory_barrier(struct vtn_builder *b, SpvScope scope,
       SpvMemorySemanticsUniformMemoryMask |
       SpvMemorySemanticsWorkgroupMemoryMask |
       SpvMemorySemanticsAtomicCounterMemoryMask |
-      SpvMemorySemanticsImageMemoryMask;
+      SpvMemorySemanticsImageMemoryMask |
+      SpvMemorySemanticsOutputMemoryMask;
 
    /* If we're not actually doing a memory barrier, bail */
    if (!(semantics & all_memory_semantics))