generators: port variable-index-read.sh to python

This patch replaces a bash based generator with a python generator. This
has the obvious advantage of remove a large swath of generated tests
from the check-in, and prevents modification of a generated file. It
also is much faster than the bash generator, so running at compile time
isn't a problem.

There are no functional differences between the bash generated versions
and the python generated versions, only whitespace/line-wrapping
differences, and small changes to the copyright header.

All tests that passed with the bash versions pass with the python
versions on the i965 driver with multiple hardware revisions.

Tested with python2.7 and python3.3

v2: - rename generated test .list file (Emil)
    - Use a shared function to add the license text
      (also removes a typo in the text spotted by Emil)

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>

216 files changed, 0 insertions, 16776 deletions

diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test
deleted file mode 100644
index 0f39fad9c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,47 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index 279a8fdea..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index bbe315cd8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,72 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 6195594f9..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,110 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test
deleted file mode 100644
index fd9fe9096..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index c72fe6615..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,72 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test
deleted file mode 100644
index aa1b3d9f8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test
deleted file mode 100644
index cd244ebfb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,47 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test
deleted file mode 100644
index 382cd6886..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index d33a6f8de..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,87 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index 0fe205cae..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,87 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index 8829d3f85..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,188 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test
deleted file mode 100644
index 41881cd11..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index f4f1aa31c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,87 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test
deleted file mode 100644
index f5d437998..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test
deleted file mode 100644
index e7ca492ac..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test
deleted file mode 100644
index 950ef1903..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index c8cda8b4b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,123 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index 3c8126703..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,102 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index f380dd88d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,296 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test
deleted file mode 100644
index 288204d7e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index f7af13db8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,102 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test
deleted file mode 100644
index 7ac10449c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test
deleted file mode 100644
index c688a8c52..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test
deleted file mode 100644
index 2e135e8db..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,44 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test
deleted file mode 100644
index e5b350081..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,58 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test
deleted file mode 100644
index 94d0b55b8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test
deleted file mode 100644
index c891d61c4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,44 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test
deleted file mode 100644
index 352b98364..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test
deleted file mode 100644
index fb1f02860..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,84 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test
deleted file mode 100644
index fb89c7a46..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test
deleted file mode 100644
index d205c331c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test
deleted file mode 100644
index ca511812c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4 m = mat4x4(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);
-
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test
deleted file mode 100644
index 934150a23..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,120 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4 m = mat4x4(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);
-
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test
deleted file mode 100644
index 69a2ea579..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4 m = mat4x4(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);
-
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test
deleted file mode 100644
index 782815857..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    mat4x4 m = mat4x4(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);
-
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test
deleted file mode 100644
index 943b312c4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index 06468cdde..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,64 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index 8f11e54bb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,75 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 96d8b46ed..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,113 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test
deleted file mode 100644
index d84e4b4a5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index c8ea690b3..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,75 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test
deleted file mode 100644
index a0e6b3d27..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,42 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test
deleted file mode 100644
index ea334661e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test
deleted file mode 100644
index ac46c7264..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index 3b98b00d7..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,90 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index abe4252c2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,90 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index 7b22586f6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,191 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test
deleted file mode 100644
index 4cd2d26d6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index a7e27657b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,90 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test
deleted file mode 100644
index eff125697..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,42 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test
deleted file mode 100644
index b231faa2b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test
deleted file mode 100644
index 2039e2584..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,60 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index 2aa60f12c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,126 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index e95785acb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index 09eba56c4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,299 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test
deleted file mode 100644
index 6716a5fda..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index a83df7c17..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test
deleted file mode 100644
index c3eb37357..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,42 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test
deleted file mode 100644
index c41545bf0..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,60 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test
deleted file mode 100644
index f02f3ec3c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,44 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test
deleted file mode 100644
index 79051eedc..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,58 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test
deleted file mode 100644
index 2924935f3..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test
deleted file mode 100644
index 8912c48f2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,44 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test
deleted file mode 100644
index f8141b823..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test
deleted file mode 100644
index cc1418e52..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,84 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test
deleted file mode 100644
index 93cc20ac2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test
deleted file mode 100644
index 8eecf9886..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test
deleted file mode 100644
index b3b98f95a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test
deleted file mode 100644
index 7434c0a37..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,120 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test
deleted file mode 100644
index e8fcbd163..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test
deleted file mode 100644
index 2d63b8f38..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test
deleted file mode 100644
index 79a31cbc8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index 393667f42..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,63 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index 9bcce28ed..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,74 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 78291cb50..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,112 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test
deleted file mode 100644
index 823cfab71..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index 19395ef4f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,74 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test
deleted file mode 100644
index e18aed4bc..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test
deleted file mode 100644
index 9b9d63ad3..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,49 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test
deleted file mode 100644
index 1583f7115..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index 23769fdb5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,89 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index c470b312d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,89 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index b1f0d8e3a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,190 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test
deleted file mode 100644
index a59cf4037..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index 4086759f7..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,89 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test
deleted file mode 100644
index 17889c2b6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test
deleted file mode 100644
index 4ba12f026..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test
deleted file mode 100644
index 46a74c0e5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,59 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index 05fa3ea14..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,125 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index db7acb7a5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,104 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index 2465eef21..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,298 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test
deleted file mode 100644
index d8ce85a74..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index f4781e016..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,104 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test
deleted file mode 100644
index fbf6a212e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test
deleted file mode 100644
index 7ebe31716..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,59 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test
deleted file mode 100644
index 4dac5d06b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,47 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test
deleted file mode 100644
index d7c552ab5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test
deleted file mode 100644
index 0776170e5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test
deleted file mode 100644
index 8cabc16f6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,47 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test
deleted file mode 100644
index ecf2f5d48..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test
deleted file mode 100644
index 0962e0322..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,87 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test
deleted file mode 100644
index 27c8424e1..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test
deleted file mode 100644
index 8709e261a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,52 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test
deleted file mode 100644
index 74ad10687..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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 vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test
deleted file mode 100644
index 4c9bf7590..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,123 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : 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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test
deleted file mode 100644
index 4ff233d6c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test
deleted file mode 100644
index 4a77e0ccb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test
deleted file mode 100644
index 98aa6f84c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,48 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index 953d59f16..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,62 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index 9d02ac43e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,73 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 8cef49c6a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,111 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test
deleted file mode 100644
index d8819f330..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index 353a5394d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,73 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test
deleted file mode 100644
index de95b7453..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,40 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test
deleted file mode 100644
index 16b96dd49..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,48 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2[3] m = mat2x2[3](
-        mat2x2(1.0, 2.0, 3.0, 4.0),
-        mat2x2(5.0, 6.0, 7.0, 8.0),
-        mat2x2(9.0, 10.0, 11.0, 12.0));
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test
deleted file mode 100644
index 97009cd6e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index 4a40ee414..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,88 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index 952679427..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,88 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index dee34fc1d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,189 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test
deleted file mode 100644
index 63380f9c4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index 5aa096c3d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,88 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test
deleted file mode 100644
index a7af03832..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,40 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test
deleted file mode 100644
index 5a198a98b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3[3] m = mat3x3[3](
-        mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-        mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-        mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test
deleted file mode 100644
index 2f5eb1b0f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,58 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index 724fca20a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,124 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index 60a8813ee..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,103 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index 1185a2074..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,297 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test
deleted file mode 100644
index 4b93c4d03..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,53 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index 40a1c2160..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,103 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test
deleted file mode 100644
index 502d5dc51..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,40 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test
deleted file mode 100644
index 07038ef7c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,58 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4[3] m = mat4x4[3](
-        mat4x4(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),
-        mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-        mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test
deleted file mode 100644
index 78238f2dd..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test
deleted file mode 100644
index c5008fffe..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,59 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test
deleted file mode 100644
index 45a4a87c5..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test
deleted file mode 100644
index 6d3a2eee3..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test
deleted file mode 100644
index 032a523f2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test
deleted file mode 100644
index d7c38227b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,85 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test
deleted file mode 100644
index 3fceb28cd..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test
deleted file mode 100644
index d296911e9..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test
deleted file mode 100644
index cfe9858bf..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4 m = mat4x4(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);
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test
deleted file mode 100644
index 770537385..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,121 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4 m = mat4x4(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);
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test
deleted file mode 100644
index 3859cff3c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4 m = mat4x4(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);
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test
deleted file mode 100644
index 3cbca9d4a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    mat4x4 m = mat4x4(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);
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test
deleted file mode 100644
index 5179b2219..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,51 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index 15fa69b6f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,65 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index 404448166..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,76 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 7b6482297..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,114 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test
deleted file mode 100644
index 64c0c6f32..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,56 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index 5f26e0788..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,76 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test
deleted file mode 100644
index 36abf2454..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,43 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test
deleted file mode 100644
index ba3fb32d8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,51 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2[3] m = mat2x2[3](
-    mat2x2(1.0, 2.0, 3.0, 4.0),
-    mat2x2(5.0, 6.0, 7.0, 8.0),
-    mat2x2(9.0, 10.0, 11.0, 12.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test
deleted file mode 100644
index d579506d6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,56 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index f85987fcd..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,91 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index 612ad20f8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,91 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index 9a768b850..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,192 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test
deleted file mode 100644
index 02b016689..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,56 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index ddd8dafe1..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,91 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test
deleted file mode 100644
index bdba71f59..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,43 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test
deleted file mode 100644
index 468875a2b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,56 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3[3] m = mat3x3[3](
-    mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
-    mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
-    mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test
deleted file mode 100644
index 34107fe52..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index 9979e064a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,127 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index f83c38a6c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,106 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index 830c3f5bb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,300 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test
deleted file mode 100644
index 13d1cbfb4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,56 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index 73689b155..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,106 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test
deleted file mode 100644
index ccdec23a2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,43 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test
deleted file mode 100644
index 0b0cbf3d6..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4[3] m = mat4x4[3](
-    mat4x4(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),
-    mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
-    mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test
deleted file mode 100644
index 2aae55511..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test
deleted file mode 100644
index bca0fe952..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,59 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test
deleted file mode 100644
index 576432879..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test
deleted file mode 100644
index 30bd0870c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test
deleted file mode 100644
index de94a1dbd..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test
deleted file mode 100644
index 123dbf254..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,85 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test
deleted file mode 100644
index 7c65df34a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test
deleted file mode 100644
index 287b0a870..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test
deleted file mode 100644
index 5961db594..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test
deleted file mode 100644
index 43d536f93..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,121 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    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]
-uniform int col;
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test
deleted file mode 100644
index 9a06d65b4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test
+++ /dev/null
@@ -1,37 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test
deleted file mode 100644
index 5eaa33557..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-    color = (m[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-uniform mat4x4 m = mat4x4(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);
-varying vec4 color;
-
-void main()
-{
-    gl_FragColor = color;
-}
-
-[test]
-clear color 0.5 0.5 0.5 0.5
-clear
-ortho
-
-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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test
deleted file mode 100644
index 6a9561f08..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,65 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] 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[1][col] == 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 vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test
deleted file mode 100644
index d1c91e1b2..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,79 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] 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[1][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 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test
deleted file mode 100644
index 4280109d8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test
+++ /dev/null
@@ -1,90 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec2 expect;
-varying mat2x2[3] 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[index][col] == 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 index 0
-uniform int col 0
-uniform vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec2 expect 5 6
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec2 expect 9 10
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test
deleted file mode 100644
index 4d4542b00..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,128 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] 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[index][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 index 0
-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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 5
-draw rect 45 5 10 10
-probe rgb 50 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 6
-draw rect 45 20 10 10
-probe rgb 50 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 9
-draw rect 85 5 10 10
-probe rgb 90 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 10
-draw rect 85 20 10 10
-probe rgb 90 25 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test
deleted file mode 100644
index 528819d3e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec2 expect;
-varying mat2x2[3] 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[index][1] == 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 index 0
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec2 expect 11 12
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test
deleted file mode 100644
index 2a11d3549..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test
+++ /dev/null
@@ -1,90 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat2x2[3] 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[index][1][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 index 0
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 11
-draw rect 100 5 10 10
-probe rgb 105 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 12
-draw rect 100 20 10 10
-probe rgb 105 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test
deleted file mode 100644
index e7f12a20c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform vec2 expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying mat2x2[3] 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[1][1] == 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 vec2 expect 7 8
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test
deleted file mode 100644
index 75b3c69b9..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,65 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 16
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat2x2[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat2(1.0, 2.0, 3.0, 4.0);
-    m[1] = mat2(5.0, 6.0, 7.0, 8.0);
-    m[2] = mat2(9.0, 10.0, 11.0, 12.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[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat2x2[3] 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[1][1][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 row 0
-uniform float expect 7
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test
deleted file mode 100644
index 2d2c939e8..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] 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[1][col] == 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 vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test
deleted file mode 100644
index 7fe84b776..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] 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[1][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 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test
deleted file mode 100644
index 56611d09c..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec3 expect;
-varying mat3x3[3] 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[index][col] == 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 index 0
-uniform int col 0
-uniform vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec3 expect 10 11 12
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 16 17 18
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec3 expect 19 20 21
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 25 26 27
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test
deleted file mode 100644
index 763f9935b..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,206 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] 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[index][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 index 0
-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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 10
-draw rect 60 5 10 10
-probe rgb 65 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 11
-draw rect 60 20 10 10
-probe rgb 65 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 12
-draw rect 60 35 10 10
-probe rgb 65 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 16
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 17
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 18
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 19
-draw rect 115 5 10 10
-probe rgb 120 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 20
-draw rect 115 20 10 10
-probe rgb 120 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 21
-draw rect 115 35 10 10
-probe rgb 120 40 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test
deleted file mode 100644
index 90e4bedc4..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec3 expect;
-varying mat3x3[3] 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[index][1] == 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 index 0
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec3 expect 22 23 24
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test
deleted file mode 100644
index 3ab09092e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat3x3[3] 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[index][1][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 index 0
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int index 1
-uniform int row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 22
-draw rect 130 5 10 10
-probe rgb 135 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 23
-draw rect 130 20 10 10
-probe rgb 135 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 24
-draw rect 130 35 10 10
-probe rgb 135 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test
deleted file mode 100644
index c87ce8a83..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform vec3 expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying mat3x3[3] 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[1][1] == 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 vec3 expect 13 14 15
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test
deleted file mode 100644
index 1300e1f44..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 31
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat3x3[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0);
-    m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0);
-    m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.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[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat3x3[3] 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[1][1][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 row 0
-uniform float expect 13
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 14
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 15
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test
deleted file mode 100644
index 975cbe385..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,75 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[1][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] 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[1][col] == 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 vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test
deleted file mode 100644
index cac073380..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,141 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[1][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] 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[1][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 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test
deleted file mode 100644
index 4d94141b7..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test
+++ /dev/null
@@ -1,120 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[index][col] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform vec4 expect;
-varying mat4x4[3] 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[index][col] == 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 index 0
-uniform int col 0
-uniform vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform int col 0
-uniform vec4 expect 17 18 19 20
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 25 26 27 28
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 29 30 31 32
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform vec4 expect 33 34 35 36
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 41 42 43 44
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 45 46 47 48
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test
deleted file mode 100644
index 1d72df23a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test
+++ /dev/null
@@ -1,314 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[index][col][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] 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[index][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 index 0
-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
-
-uniform int index 1
-uniform int col 0
-uniform int row 0
-uniform float expect 17
-draw rect 75 5 10 10
-probe rgb 80 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 18
-draw rect 75 20 10 10
-probe rgb 80 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 19
-draw rect 75 35 10 10
-probe rgb 80 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 20
-draw rect 75 50 10 10
-probe rgb 80 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 25
-draw rect 105 5 10 10
-probe rgb 110 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 26
-draw rect 105 20 10 10
-probe rgb 110 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 27
-draw rect 105 35 10 10
-probe rgb 110 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 28
-draw rect 105 50 10 10
-probe rgb 110 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 29
-draw rect 120 5 10 10
-probe rgb 125 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 30
-draw rect 120 20 10 10
-probe rgb 125 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 31
-draw rect 120 35 10 10
-probe rgb 125 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 32
-draw rect 120 50 10 10
-probe rgb 125 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int col 0
-uniform int row 0
-uniform float expect 33
-draw rect 145 5 10 10
-probe rgb 150 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 34
-draw rect 145 20 10 10
-probe rgb 150 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 35
-draw rect 145 35 10 10
-probe rgb 150 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 36
-draw rect 145 50 10 10
-probe rgb 150 55 0.0 1.0 0.0
-
-uniform int col 1
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 41
-draw rect 175 5 10 10
-probe rgb 180 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 42
-draw rect 175 20 10 10
-probe rgb 180 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 43
-draw rect 175 35 10 10
-probe rgb 180 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 44
-draw rect 175 50 10 10
-probe rgb 180 55 0.0 1.0 0.0
-
-uniform int col 3
-uniform int row 0
-uniform float expect 45
-draw rect 190 5 10 10
-probe rgb 195 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 46
-draw rect 190 20 10 10
-probe rgb 195 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 47
-draw rect 190 35 10 10
-probe rgb 195 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 48
-draw rect 190 50 10 10
-probe rgb 195 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test
deleted file mode 100644
index 0056d1cea..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[index][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform vec4 expect;
-varying mat4x4[3] 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[index][1] == 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 index 0
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int index 1
-uniform vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int index 2
-uniform vec4 expect 37 38 39 40
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test
deleted file mode 100644
index 13c16ff47..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test
+++ /dev/null
@@ -1,120 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[index][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int index;
-uniform int row;
-uniform float expect;
-varying mat4x4[3] 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[index][1][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 index 0
-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 index 1
-uniform int row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
-uniform int index 2
-uniform int row 0
-uniform float expect 37
-draw rect 160 5 10 10
-probe rgb 165 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 38
-draw rect 160 20 10 10
-probe rgb 165 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 39
-draw rect 160 35 10 10
-probe rgb 165 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 40
-draw rect 160 50 10 10
-probe rgb 165 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test
deleted file mode 100644
index 26bebc7cd..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test
+++ /dev/null
@@ -1,57 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform vec4 expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[1][1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying mat4x4[3] 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[1][1] == 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 vec4 expect 21 22 23 24
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test
deleted file mode 100644
index feb62321f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,75 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 52
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat4x4[3] m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m[0] = 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);
-    m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0);
-    m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.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[1][1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat4x4[3] 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[1][1][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 row 0
-uniform float expect 21
-draw rect 90 5 10 10
-probe rgb 95 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 22
-draw rect 90 20 10 10
-probe rgb 95 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 23
-draw rect 90 35 10 10
-probe rgb 95 40 0.0 1.0 0.0
-
-uniform int row 3
-uniform float expect 24
-draw rect 90 50 10 10
-probe rgb 95 55 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test
deleted file mode 100644
index ae7a107eb..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test
+++ /dev/null
@@ -1,63 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.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] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec2 expect;
-varying mat2x2 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] == 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 vec2 expect 1 2
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test
deleted file mode 100644
index 2a425019d..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test
+++ /dev/null
@@ -1,77 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat2x2 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 col 1
-uniform int row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test
deleted file mode 100644
index 50cae7791..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform vec2 expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.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[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec2 expect;
-varying mat2x2 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[1] == 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 vec2 expect 3 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test
deleted file mode 100644
index 64cf19474..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test
+++ /dev/null
@@ -1,63 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 8
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat2x2 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat2x2(1.0, 2.0, 3.0, 4.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[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat2x2 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[1][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 row 0
-uniform float expect 3
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 4
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test
deleted file mode 100644
index 89737490a..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test
+++ /dev/null
@@ -1,68 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.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] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec3 expect;
-varying mat3x3 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] == 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 vec3 expect 1 2 3
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec3 expect 7 8 9
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test
deleted file mode 100644
index c9fd0c7b0..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test
+++ /dev/null
@@ -1,103 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat3x3 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 col 1
-uniform int row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
-uniform int col 2
-uniform int row 0
-uniform float expect 7
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 8
-draw rect 35 20 10 10
-probe rgb 40 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 9
-draw rect 35 35 10 10
-probe rgb 40 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test
deleted file mode 100644
index 57ca771c1..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform vec3 expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.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[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec3 expect;
-varying mat3x3 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[1] == 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 vec3 expect 4 5 6
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test
deleted file mode 100644
index 2ede1046e..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test
+++ /dev/null
@@ -1,68 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 13
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat3x3 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.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[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat3x3 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[1][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 row 0
-uniform float expect 4
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int row 1
-uniform float expect 5
-draw rect 20 20 10 10
-probe rgb 25 25 0.0 1.0 0.0
-
-uniform int row 2
-uniform float expect 6
-draw rect 20 35 10 10
-probe rgb 25 40 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test
deleted file mode 100644
index 3ffde8929..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test
+++ /dev/null
@@ -1,73 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int col;
-uniform vec4 expect;
-varying mat4x4 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] == 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 vec4 expect 1 2 3 4
-draw rect 5 5 10 10
-probe rgb 10 10 0.0 1.0 0.0
-
-uniform int col 1
-uniform vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
-uniform int col 2
-uniform vec4 expect 9 10 11 12
-draw rect 35 5 10 10
-probe rgb 40 10 0.0 1.0 0.0
-
-uniform int col 3
-uniform vec4 expect 13 14 15 16
-draw rect 50 5 10 10
-probe rgb 55 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test
deleted file mode 100644
index 51f584d2f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test
+++ /dev/null
@@ -1,139 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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]
-uniform int col;
-uniform int row;
-uniform float expect;
-varying mat4x4 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
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test
deleted file mode 100644
index 2ff947619..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform vec4 expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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[1] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform vec4 expect;
-varying mat4x4 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[1] == 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 vec4 expect 5 6 7 8
-draw rect 20 5 10 10
-probe rgb 25 10 0.0 1.0 0.0
-
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test
deleted file mode 100644
index 6cc06b48f..000000000
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test
+++ /dev/null
@@ -1,73 +0,0 @@
-# Test generated by:
-# ../../../glsl-1.10/variable-index-read.sh 1.20
-
-[require]
-GLSL >= 1.20
-GL_MAX_VARYING_COMPONENTS >= 20
-
-[vertex shader]
-uniform int row;
-uniform float expect;
-varying mat4x4 m;
-varying vec4 color;
-
-void main()
-{
-    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-
-    m = mat4x4(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[1][row] == expect)
-        ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-[fragment shader]
-uniform int row;
-uniform float expect;
-varying mat4x4 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[1][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 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
-