Józef Kucia : libs/vkd3d-shader: Adjust barrier emission.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: daebeb3e1169f9779ea629d6db40794e48bb0b9e
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=daebeb3e1169f9779ea629d6...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Jan 25 12:04:26 2018 +0100

libs/vkd3d-shader: Adjust barrier emission.

Aligns with glsang changes which are based on Khronos recommendations.

https://github.com/KhronosGroup/glslang/commit/8297936dd6eb32163991899c31dd1...
https://github.com/KhronosGroup/glslang/commit/838d7afc61c0f5909514c20cd0ed0...
https://github.com/KhronosGroup/glslang/commit/2505057af8f446981afc63768a97a...

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/spirv.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 202c18d..50803af 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5393,7 +5393,9 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler,
     unsigned int flags = instruction->flags;
     SpvScope execution_scope = SpvScopeMax;
     SpvScope memory_scope = SpvScopeDevice;
-    unsigned int memory_semantics = 0;
+    unsigned int memory_semantics;
+
+    memory_semantics = SpvMemorySemanticsAcquireReleaseMask;
 
     if (flags & VKD3DSSF_GROUP_SHARED_MEMORY)
     {
@@ -5413,8 +5415,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler,
         FIXME("Unhandled sync flags %#x.\n", flags);
         memory_scope = SpvScopeDevice;
         execution_scope = SpvScopeWorkgroup;
-        memory_semantics |= SpvMemorySemanticsSequentiallyConsistentMask
-                | SpvMemorySemanticsUniformMemoryMask
+        memory_semantics |= SpvMemorySemanticsUniformMemoryMask
                 | SpvMemorySemanticsSubgroupMemoryMask
                 | SpvMemorySemanticsWorkgroupMemoryMask
                 | SpvMemorySemanticsCrossWorkgroupMemoryMask