From 5ffc813dc424e338c295363a79ca5711874bacf6 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Thu, 17 Aug 2023 12:07:11 +0200 Subject: [PATCH] GLSL: Require mesh shader when using perprimitiveEXT in frag shader. --- ...mesh-shader-perprimitive.spv14.nocompat.vk.frag.vk | 11 +++++++++++ .../mesh-shader-perprimitive.spv14.nocompat.vk.frag | 10 ++++++++++ spirv_glsl.cpp | 5 ++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 reference/shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag.vk create mode 100644 shaders-no-opt/frag/mesh-shader-perprimitive.spv14.nocompat.vk.frag 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 new file mode 100644 index 00000000..7ab0e950 --- /dev/null +++ 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 new file mode 100644 index 00000000..8dffccc2 --- /dev/null +++ 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 index 690bc9d3..09d019bd 100644 --- 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)) {