1 files changed, 140 insertions, 0 deletions
diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test
new file mode 100644
index 000000000..1a50570b5
--- /dev/null
+++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test
@@ -0,0 +1,140 @@
+# Test generated by:
+# ../../../glsl-1.10/variable-index-read.sh 1.10
+
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+#version 110
+uniform int col;
+uniform int row;
+uniform float expect;
+varying mat4 m;
+varying vec4 color;
+
+void main()
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+    m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0);
+
+    /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec:
+     *
+     *     "A vertex shader may also read varying variables, getting back the
+     *     same values it has written. Reading a varying variable in a vertex
+     *     shader returns undefined values if it is read before being
+     *     written."
+     */
+    color = (m[col][row] == expect)
+        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
+}
+
+[fragment shader]
+#version 110
+uniform int col;
+uniform int row;
+uniform float expect;
+varying mat4 m;
+varying vec4 color;
+
+void main()
+{
+    /* There is some trickery here.  The fragment shader has to actually use
+     * the varyings generated by the vertex shader, or the compiler (more
+     * likely the linker) might demote the varying outputs to just be vertex
+     * shader global variables.  Since the point of the test is the vertex
+     * shader reading from a varying, that would defeat the test.
+     */
+    gl_FragColor = (m[col][row] == expect)
+        ? color : vec4(1.0, 0.0, 0.0, 1.0);
+}
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+ortho
+
+uniform int col 0
+uniform int row 0
+uniform float expect 1
+draw rect 5 5 10 10
+probe rgb 10 10 0.0 1.0 0.0
+
+uniform int row 1
+uniform float expect 2
+draw rect 5 20 10 10
+probe rgb 10 25 0.0 1.0 0.0
+
+uniform int row 2
+uniform float expect 3
+draw rect 5 35 10 10
+probe rgb 10 40 0.0 1.0 0.0
+
+uniform int row 3
+uniform float expect 4
+draw rect 5 50 10 10
+probe rgb 10 55 0.0 1.0 0.0
+
+uniform int col 1
+uniform int row 0
+uniform float expect 5
+draw rect 20 5 10 10
+probe rgb 25 10 0.0 1.0 0.0
+
+uniform int row 1
+uniform float expect 6
+draw rect 20 20 10 10
+probe rgb 25 25 0.0 1.0 0.0
+
+uniform int row 2
+uniform float expect 7
+draw rect 20 35 10 10
+probe rgb 25 40 0.0 1.0 0.0
+
+uniform int row 3
+uniform float expect 8
+draw rect 20 50 10 10
+probe rgb 25 55 0.0 1.0 0.0
+
+uniform int col 2
+uniform int row 0
+uniform float expect 9
+draw rect 35 5 10 10
+probe rgb 40 10 0.0 1.0 0.0
+
+uniform int row 1
+uniform float expect 10
+draw rect 35 20 10 10
+probe rgb 40 25 0.0 1.0 0.0
+
+uniform int row 2
+uniform float expect 11
+draw rect 35 35 10 10
+probe rgb 40 40 0.0 1.0 0.0
+
+uniform int row 3
+uniform float expect 12
+draw rect 35 50 10 10
+probe rgb 40 55 0.0 1.0 0.0
+
+uniform int col 3
+uniform int row 0
+uniform float expect 13
+draw rect 50 5 10 10
+probe rgb 55 10 0.0 1.0 0.0
+
+uniform int row 1
+uniform float expect 14
+draw rect 50 20 10 10
+probe rgb 55 25 0.0 1.0 0.0
+
+uniform int row 2
+uniform float expect 15
+draw rect 50 35 10 10
+probe rgb 55 40 0.0 1.0 0.0
+
+uniform int row 3
+uniform float expect 16
+draw rect 50 50 10 10
+probe rgb 55 55 0.0 1.0 0.0
+