Merge pull request #2185 from KhronosGroup/perprimitive-fix

GLSL: Require mesh shader when using perprimitiveEXT in frag shader.
KhronosGroup · Aug 17, 2023 · e7e2e8c · e7e2e8c
2 parents 62664e4 + 5ffc813
commit e7e2e8c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/reference/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag.vk b/reference/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag.vk
@@ -0,0 +1,11 @@
+#version 450
+#extension GL_EXT_mesh_shader : require
+
+layout(location = 0) out vec4 FragColor;
+layout(location = 0) flat perprimitiveEXT in uvec4 v;
+
+void main()
+{
+    FragColor = vec4(v);
+}
+
diff --git a/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag b/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag
@@ -0,0 +1,10 @@
+#version 450
+#extension GL_EXT_mesh_shader : require
+
+layout(location = 0) perprimitiveEXT flat in uvec4 v;
+layout(location = 0) out vec4 FragColor;
+
+void main()
+{
+	FragColor = vec4(v);
+}
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
@@ -1295,7 +1295,10 @@ string CompilerGLSL::to_interpolation_qualifiers(const Bitset &flags)
 	if (flags.get(DecorationInvariant) && (options.es || options.version >= 120))
 		res += "invariant ";
 	if (flags.get(DecorationPerPrimitiveEXT))
-	    res += "perprimitiveEXT ";
+	{
+		res += "perprimitiveEXT ";
+		require_extension_internal("GL_EXT_mesh_shader");
+	}
 
 	if (flags.get(DecorationExplicitInterpAMD))
 	{