Merge pull request #2438 from KhronosGroup/fix-2432

GLSL: Deal with gl_Layer in vert/tese.
KhronosGroup · Jan 23, 2025 · ae9ee0e · ae9ee0e
2 parents 597881e + a07b462
commit ae9ee0e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/reference/shaders-no-opt/vert/vertex-layer.vert b/reference/shaders-no-opt/vert/vertex-layer.vert
@@ -0,0 +1,17 @@
+#version 450
+#ifdef GL_ARB_shader_draw_parameters
+#extension GL_ARB_shader_draw_parameters : enable
+#endif
+#extension GL_ARB_shader_viewport_layer_array : require
+
+#ifdef GL_ARB_shader_draw_parameters
+#define SPIRV_Cross_BaseInstance gl_BaseInstanceARB
+#else
+uniform int SPIRV_Cross_BaseInstance;
+#endif
+
+void main()
+{
+    gl_Layer = (gl_InstanceID + SPIRV_Cross_BaseInstance);
+}
+
diff --git a/shaders-no-opt/vert/vertex-layer.vert b/shaders-no-opt/vert/vertex-layer.vert
@@ -0,0 +1,7 @@
+#version 450
+#extension GL_ARB_shader_viewport_layer_array : require
+
+void main()
+{
+	gl_Layer = gl_InstanceIndex;
+}
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
@@ -9824,7 +9824,17 @@ string CompilerGLSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
 	case BuiltInInvocationId:
 		return "gl_InvocationID";
 	case BuiltInLayer:
+	{
+		auto model = get_execution_model();
+		if (model == ExecutionModelVertex || model == ExecutionModelTessellationEvaluation)
+		{
+			if (options.es)
+				require_extension_internal("GL_NV_viewport_array2");
+			else
+				require_extension_internal("GL_ARB_shader_viewport_layer_array");
+		}
 		return "gl_Layer";
+	}
 	case BuiltInViewportIndex:
 		return "gl_ViewportIndex";
 	case BuiltInTessLevelOuter: