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
similarity index 100%
rename from reference/opt/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk
rename to 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
similarity index 100%
rename from reference/opt/shaders/task/task-shader-basic-2.vk.spv14.nocompat.task.vk
rename to 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
similarity index 100%
rename from reference/shaders/task/task-shader-basic.vk.spv14.nocompat.task.vk
rename to 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
similarity index 100%
rename from shaders-no-opt/asm/task/task-shader.vk.nocompat.invalid.spv14.asm.task
rename to 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]));
+}