Merge pull request #2017 from KhronosGroup/roll-deps

Roll dependencies

9 files changed, 65 insertions, 79 deletions

diff --git a/checkout_glslang_spirv_tools.sh b/checkout_glslang_spirv_tools.sh
index 2530e924..82017008 100755
--- a/checkout_glslang_spirv_tools.sh
+++ b/checkout_glslang_spirv_tools.sh
@@ -2,8 +2,8 @@
 # Copyright 2016-2021 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-GLSLANG_REV=a53aa3e94f8b4bf22a6eb6e8a207fe91ab02b989
-SPIRV_TOOLS_REV=4c456f7da67c5437a6fb7d4d20d78e2a5ae2acf2
+GLSLANG_REV=df7fec2cfa966919172ee83bfcae6c9c9b3f91b8
+SPIRV_TOOLS_REV=fb27bbf3077f92cc1a8a55777bce2810a94079cf
 SPIRV_HEADERS_REV=87d5b782bec60822aa878941e6b13c0a9a954c9b
 PROTOCOL=https
 
diff --git a/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task.vk b/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task.vk
deleted file mode 100644
index 1d491e70..00000000
--- a/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task.vk
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 450
-#extension GL_EXT_mesh_shader : require
-layout(local_size_x = 4, local_size_y = 3, local_size_z = 2) in;
-
-struct Payload
-{
-    float v[3];
-};
-
-shared float vs[24];
-taskPayloadSharedEXT Payload p;
-
-void main()
-{
-    vs[gl_LocalInvocationIndex] = 10.0;
-    barrier();
-    if (gl_LocalInvocationIndex < 12u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 12u];
-    }
-    barrier();
-    if (gl_LocalInvocationIndex < 6u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 6u];
-    }
-    barrier();
-    if (gl_LocalInvocationIndex < 3u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 3u];
-    }
-    barrier();
-    p.v[gl_LocalInvocationIndex] = vs[gl_LocalInvocationIndex];
-    EmitMeshTasksEXT(uint(int(vs[4])), uint(int(vs[6])), uint(int(vs[8])));
-}
-
diff --git a/reference/opt/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk b/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.spv14.asm.task.vk
index 1d491e70..1d491e70 100644
--- a/reference/opt/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk
+++ b/reference/shaders-no-opt/asm/task/task-shader.vk.nocompat.spv14.asm.task.vk
diff --git a/reference/opt/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk b/reference/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
index 98704e22..98704e22 100644
--- a/reference/opt/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
+++ b/reference/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
diff --git a/reference/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk b/reference/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task.vk
index 1d491e70..1d491e70 100644
--- a/reference/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk
+++ b/reference/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task.vk
diff --git a/reference/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk b/reference/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
deleted file mode 100644
index 98704e22..00000000
--- a/reference/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
+++ /dev/null
@@ -1,42 +0,0 @@
-#version 450
-#extension GL_EXT_mesh_shader : require
-layout(local_size_x = 4, local_size_y = 3, local_size_z = 2) in;
-
-struct Payload
-{
-    float v[3];
-};
-
-shared float vs[24];
-taskPayloadSharedEXT Payload p;
-
-void main()
-{
-    vs[gl_LocalInvocationIndex] = 10.0;
-    barrier();
-    if (gl_LocalInvocationIndex < 12u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 12u];
-    }
-    barrier();
-    if (gl_LocalInvocationIndex < 6u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 6u];
-    }
-    barrier();
-    if (gl_LocalInvocationIndex < 3u)
-    {
-        vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 3u];
-    }
-    barrier();
-    p.v[gl_LocalInvocationIndex] = vs[gl_LocalInvocationIndex];
-    if (vs[5] > 20.0)
-    {
-        EmitMeshTasksEXT(uint(int(vs[4])), uint(int(vs[6])), uint(int(vs[8])));
-    }
-    else
-    {
-        EmitMeshTasksEXT(uint(int(vs[6])), 10u, 50u);
-    }
-}
-
diff --git a/shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task b/shaders-no-opt/asm/task/task-shader.vk.nocompat.spv14.asm.task
index cbef97ed..cbef97ed 100644
--- a/shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task
+++ b/shaders-no-opt/asm/task/task-shader.vk.nocompat.spv14.asm.task
diff --git a/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task b/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task
new file mode 100644
index 00000000..3fcb7147
--- /dev/null
+++ b/shaders-no-opt/task/task-shader-basic-2.vk.spv14.nocompat.task
@@ -0,0 +1,35 @@
+#version 450
+#extension GL_EXT_mesh_shader : require
+layout(local_size_x = 4, local_size_y = 3, local_size_z = 2) in;
+
+struct Payload
+{
+	float v[3];
+};
+taskPayloadSharedEXT Payload p;
+shared float vs[24];
+
+void main()
+{
+	vs[gl_LocalInvocationIndex] = 10.0;
+	barrier();
+	if (gl_LocalInvocationIndex < 12)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 12];
+	barrier();
+	if (gl_LocalInvocationIndex < 6)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 6];
+	barrier();
+	if (gl_LocalInvocationIndex < 3)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 3];
+	barrier();
+
+	p.v[gl_LocalInvocationIndex] = vs[gl_LocalInvocationIndex];
+	if (vs[5] > 20.0)
+	{
+		EmitMeshTasksEXT(int(vs[4]), int(vs[6]), int(vs[8]));
+	}
+	else
+	{
+		EmitMeshTasksEXT(int(vs[6]), 10, 50u);
+	}
+}
diff --git a/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task b/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task
new file mode 100644
index 00000000..6e971603
--- /dev/null
+++ b/shaders-no-opt/task/task-shader-basic.vk.spv14.nocompat.task
@@ -0,0 +1,28 @@
+#version 450
+#extension GL_EXT_mesh_shader : require
+layout(local_size_x = 4, local_size_y = 3, local_size_z = 2) in;
+
+struct Payload
+{
+	float v[3];
+};
+taskPayloadSharedEXT Payload p;
+shared float vs[24];
+
+void main()
+{
+	vs[gl_LocalInvocationIndex] = 10.0;
+	barrier();
+	if (gl_LocalInvocationIndex < 12)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 12];
+	barrier();
+	if (gl_LocalInvocationIndex < 6)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 6];
+	barrier();
+	if (gl_LocalInvocationIndex < 3)
+		vs[gl_LocalInvocationIndex] += vs[gl_LocalInvocationIndex + 3];
+	barrier();
+
+	p.v[gl_LocalInvocationIndex] = vs[gl_LocalInvocationIndex];
+	EmitMeshTasksEXT(int(vs[4]), int(vs[6]), int(vs[8]));
+}