[PATCH vkd3d 1/2] libs/vkd3d-shader: Adjust barrier emission.

[Józef Kucia]

From: Józef Kucia

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 
---
 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 202c18d61924..50803af1f69f 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

[PATCH vkd3d 2/2] libs/vkd3d-shader: Use GLSL.std450 NMin, NMax and NClamp opcodes.

[Józef Kucia]

From: Józef Kucia

This reverts commit 70f5b24f92f5ae2270f37c6f7f519c4c3f26aec0.

The bug is fixed in Nvidia drivers.

Signed-off-by: Józef Kucia 
---
 libs/vkd3d-shader/spirv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 50803af1f69f..d92b7b1336b7 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -1423,9 +1423,8 @@ static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_build
 {
     uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder);
     uint32_t operands[] = {x, min, max};
-    /* XXX: We would prefer to use NClamp but NClamp crashes the Nvidia driver. */
     return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id,
-            GLSLstd450FClamp, operands, ARRAY_SIZE(operands));
+            GLSLstd450NClamp, operands, ARRAY_SIZE(operands));
 }

static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder,
@@ -3733,11 +3732,8 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction(
         {VKD3DSIH_IMIN,            GLSLstd450SMin},
         {VKD3DSIH_LOG,             GLSLstd450Log2},
         {VKD3DSIH_MAD,             GLSLstd450Fma},
-        /* XXX: We would prefer to use NMax/NMin but these opcodes lead to
-         * a crash in the Nvidia driver.
-         */
-        {VKD3DSIH_MAX,             GLSLstd450FMax},
-        {VKD3DSIH_MIN,             GLSLstd450FMin},
+        {VKD3DSIH_MAX,             GLSLstd450NMax},
+        {VKD3DSIH_MIN,             GLSLstd450NMin},
         {VKD3DSIH_ROUND_NI,        GLSLstd450Floor},
         {VKD3DSIH_ROUND_PI,        GLSLstd450Ceil},
         {VKD3DSIH_ROUND_Z,         GLSLstd450Trunc},

[PATCH vkd3d 2/2] libs/vkd3d-shader: Use GLSL.std450 NMin, NMax and NClamp opcodes.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[Henri Verbeet]

Signed-off-by: Henri Verbeet