Redeclare an unsized array with an initializer

Reproduces Mesa bugzilla #34374.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>

3 files changed, 55 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 89c3046af..e078349ac 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -356,6 +356,7 @@ add_shader_generic(shaders, 'glsl-fs-add-masked')
 add_shader_generic(shaders, 'glsl-fs-all-01')
 add_shader_generic(shaders, 'glsl-fs-all-02')
 add_shader_generic(shaders, 'glsl-fs-any')
+add_shader_generic(shaders, 'glsl-fs-array-redclaration')
 add_shader_generic(shaders, 'glsl-fs-asin')
 add_shader_generic(shaders, 'glsl-fs-atan-1')
 add_shader_generic(shaders, 'glsl-fs-atan-2')
@@ -561,6 +562,7 @@ add_shader_generic(shaders, 'glsl-vs-neg-abs')
 add_plain_test(shaders, 'glsl-vs-normalscale')
 add_shader_generic(shaders, 'glsl-vs-arrays-2')
 add_shader_generic(shaders, 'glsl-vs-arrays-3')
+add_shader_generic(shaders, 'glsl-vs-array-redclaration')
 add_shader_generic(shaders, 'glsl-vs-clamp-1')
 add_shader_generic(shaders, 'glsl-vs-cross')
 add_shader_generic(shaders, 'glsl-vs-cross-2')
diff --git a/tests/shaders/glsl-fs-array-redeclaration.shader_test b/tests/shaders/glsl-fs-array-redeclaration.shader_test
new file mode 100644
index 000000000..cf180aa4e
--- /dev/null
+++ b/tests/shaders/glsl-fs-array-redeclaration.shader_test
@@ -0,0 +1,22 @@
+#This test reproduces Mesa bug 34374.
+[require]
+GLSL >= 1.20
+
+[vertex shader file]
+glsl-mvp.vert
+
+[fragment shader]
+#version 120
+void main()
+{
+	float a[];
+	float a[] = float[](0,1);
+	if (a[1] == 1)
+		gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
+	else
+		gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0
diff --git a/tests/shaders/glsl-vs-array-redeclaration.shader_test b/tests/shaders/glsl-vs-array-redeclaration.shader_test
new file mode 100644
index 000000000..1fdc7e0a3
--- /dev/null
+++ b/tests/shaders/glsl-vs-array-redeclaration.shader_test
@@ -0,0 +1,31 @@
+#This test reproduces Mesa bug 34374.
+[require]
+GLSL >= 1.20
+
+[vertex shader]
+#version 120
+varying vec4 color;
+
+void main()
+{
+	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+	float a[];
+	float a[] = float[](0,1);
+	if (a[1] == 1)
+		color = vec4(0.0, 1.0, 0.0, 1.0);
+	else
+		color = vec4(1.0, 0.0, 0.0, 1.0);
+}
+
+[fragment shader]
+varying vec4 color;
+
+void main()
+{
+	gl_FragColor = color;
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0