2 files changed, 44 insertions, 0 deletions
diff --git a/tests/diagnostics/glsl-global-const-with-init.slang b/tests/diagnostics/glsl-global-const-with-init.slang
new file mode 100644
index 000000000..ff5b35b75
--- /dev/null
+++ b/tests/diagnostics/glsl-global-const-with-init.slang
@@ -0,0 +1,26 @@
+//TEST:SIMPLE(filecheck=CHK): -target glsl -stage fragment -entry main -allow-glsl
+
+// Test for GLSL mode: global const variables with initializers should be allowed
+// In GLSL mode, global const variables are real constants, not uniform parameters
+// This should NOT produce the error 31224 that would trigger in HLSL mode
+
+#version 450
+
+// These should NOT trigger error 31224 in GLSL mode (they would in HLSL)
+const float globalConstWithInit = 1.0;        // OK in GLSL - real constant
+const vec3 globalVecConst = vec3(1.0, 2.0, 3.0); // OK in GLSL - real constant
+const int globalIntConst = 42;                // OK in GLSL - real constant
+
+// Regular uniforms without const should still be allowed
+uniform float uniformFloat;                   // OK - uniform without const
+uniform vec4 uniformVec;                     // OK - uniform without const
+
+// CHK-NOT: error 31224
+// CHK: void main()
+
+out vec4 fragColor;
+
+void main() 
+{
+    fragColor = vec4(globalConstWithInit, globalVecConst.x, globalIntConst, 1.0);
+}
+\ No newline at end of file
diff --git a/tests/diagnostics/hlsl-global-const-with-init-still-errors.slang b/tests/diagnostics/hlsl-global-const-with-init-still-errors.slang
new file mode 100644
index 000000000..71471a6b3
--- /dev/null
+++ b/tests/diagnostics/hlsl-global-const-with-init-still-errors.slang
@@ -0,0 +1,18 @@
+//TEST:SIMPLE(filecheck=CHK): -target hlsl -entry main
+
+// Test to ensure HLSL mode still produces the diagnostic for global const with initializers
+// This verifies our fix doesn't break existing HLSL behavior
+
+// This should trigger error 31224 in HLSL mode
+//CHK: ([[# @LINE + 1]]): error 31224: global const variable with initializer must be declared static: 'globalConstWithInit'
+const float globalConstWithInit = 1.0f;
+
+// This should also trigger error 31224 in HLSL mode  
+//CHK: ([[# @LINE + 1]]): error 31224: global const variable with initializer must be declared static: 'uniformWithInit'
+uniform float uniformWithInit = 2.0f;
+
+[shader("vertex")]
+float4 main() : SV_Position
+{
+    return float4(1, 0, 0, 1);
+}
+\ No newline at end of file