Update test data files with a rerun of variable-index-read.sh and

variable-index-write.sh. Default precision added.

324 files changed, 1620 insertions, 1152 deletions

diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-rd.shader_test
index 6ace76dc..efd95ed2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying vec4 color;
@@ -43,12 +45,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-row-rd.shader_test
index 06204a11..e79769d1 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -55,8 +56,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -66,3 +67,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-rd.shader_test
index 2f4f94e9..b903afa0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -46,34 +48,34 @@ clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-row-rd.shader_test
index aa95b7d0..5b20d72c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -58,8 +59,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -69,9 +70,9 @@ 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
@@ -81,8 +82,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -92,9 +93,9 @@ 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
@@ -104,8 +105,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -115,3 +116,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-rd.shader_test
index 753bc777..2808ba8a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 varying vec4 color;
@@ -43,17 +45,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-row-rd.shader_test
index 8308bde8..0a366989 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -55,8 +56,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -66,8 +67,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -77,3 +78,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-rd.shader_test
index 93f74921..003ff8f1 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying vec4 color;
 
@@ -40,7 +42,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-row-rd.shader_test
index 14450035..8cee4389 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -42,7 +44,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -52,3 +53,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-rd.shader_test
index 027cbc98..53486118 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying vec4 color;
@@ -43,17 +45,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-row-rd.shader_test
index ae64a7ab..bdcb85cf 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -60,8 +61,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -76,8 +77,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -92,3 +93,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-rd.shader_test
index e976690b..1def767d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -46,49 +48,49 @@ clear
 
 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-row-rd.shader_test
index 67d06263..0441bf33 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -63,8 +64,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -79,8 +80,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -95,9 +96,9 @@ 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
@@ -112,8 +113,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -128,8 +129,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -144,9 +145,9 @@ 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
@@ -161,8 +162,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -177,8 +178,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -193,3 +194,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-rd.shader_test
index 509fe19a..4593bff5 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 varying vec4 color;
@@ -43,17 +45,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-row-rd.shader_test
index 5aec0a0d..34d5c1cb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -60,8 +61,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -76,8 +77,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -92,3 +93,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-rd.shader_test
index c37bb551..83b3e904 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying vec4 color;
 
@@ -40,7 +42,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-row-rd.shader_test
index b02eb214..9c85ae25 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -42,7 +44,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -57,3 +58,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-rd.shader_test
index b6478c96..1e84756b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying vec4 color;
@@ -43,22 +45,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-row-rd.shader_test
index aa111ba8..0156c430 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -65,8 +66,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -86,8 +87,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -107,8 +108,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -128,3 +129,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-rd.shader_test
index 05b42e08..49d8f37e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -46,64 +48,64 @@ clear
 
 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 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 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 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-row-rd.shader_test
index dbd75c2c..eabf95dc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -68,8 +69,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -89,8 +90,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -110,8 +111,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -131,9 +132,9 @@ 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
@@ -153,8 +154,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -174,8 +175,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -195,8 +196,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -216,9 +217,9 @@ 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
@@ -238,8 +239,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -259,8 +260,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -280,8 +281,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -301,3 +302,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-rd.shader_test
index e268ff4b..220f0be7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 varying vec4 color;
@@ -43,17 +45,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-row-rd.shader_test
index 03cd6ef3..f2e5dc56 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -65,8 +66,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -86,8 +87,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -107,3 +108,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-rd.shader_test
index fce915a5..2d39b41d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying vec4 color;
 
@@ -40,7 +42,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-row-rd.shader_test
index d8eec78b..36af7657 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -42,7 +44,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -62,3 +63,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-rd.shader_test
index 22bcffd7..bf558b2d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying vec4 color;
@@ -40,12 +42,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-row-rd.shader_test
index 6be97e58..155348af 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -42,7 +44,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -52,8 +53,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -63,3 +64,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-rd.shader_test
index 16a88519..8aa9bc98 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying vec4 color;
 
@@ -37,7 +39,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-row-rd.shader_test
index a5850100..057a414e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -39,7 +41,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -49,3 +50,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-rd.shader_test
index f2d62ec7..5571dcb6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying vec4 color;
@@ -40,17 +42,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-row-rd.shader_test
index d8667a1c..274eb09e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -42,7 +44,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -57,8 +58,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -73,8 +74,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -89,3 +90,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-rd.shader_test
index 1fd269d0..879071f2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying vec4 color;
 
@@ -37,7 +39,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-row-rd.shader_test
index 6b9eba5b..f62777a3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -39,7 +41,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -54,3 +55,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-rd.shader_test
index 7fe06b94..4b6efc7a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying vec4 color;
@@ -40,22 +42,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-row-rd.shader_test
index 592f6c7e..7a6a8a79 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -42,7 +44,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -62,8 +63,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -83,8 +84,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -104,8 +105,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -125,3 +126,4 @@ 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-es-1.00/execution/variable-index-read/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-rd.shader_test
index 4dbee298..d3f3795f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -22,6 +22,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying vec4 color;
 
@@ -37,7 +39,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-row-rd.shader_test
index 81015b37..9406d483 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-temp-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -39,7 +41,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -59,3 +60,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-rd.shader_test
index ccbfb65b..e03d1f0d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 uniform mat2 m[3];
@@ -42,12 +44,12 @@ clear
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-row-rd.shader_test
index e3050f48..3caf5f6c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -54,8 +55,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -65,3 +66,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-rd.shader_test
index 7bde0f99..e17051e0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -46,40 +48,40 @@ uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 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 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-row-rd.shader_test
index f493388e..29aaa0d4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -58,8 +59,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -69,12 +70,12 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -84,8 +85,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -95,12 +96,12 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 9
 draw rect 85 5 10 10
@@ -110,8 +111,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -121,3 +122,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-rd.shader_test
index eec1ad18..fbc8e2bc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 uniform mat2 m[3];
@@ -43,23 +45,23 @@ uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-row-rd.shader_test
index a0ea397f..b17c6617 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -55,11 +56,11 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 1
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -69,11 +70,11 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 2
-
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -83,3 +84,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-rd.shader_test
index 4f2a17a0..e72121e1 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 uniform mat2 m[3];
 varying vec4 color;
@@ -39,7 +41,7 @@ clear
 
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
-
 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-row-rd.shader_test
index f8a14dc6..16e6d039 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat2 m[3];
@@ -41,7 +43,6 @@ clear
 
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -51,3 +52,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-rd.shader_test
index 52536c7d..9dcd39e8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 uniform mat3 m[3];
@@ -42,17 +44,17 @@ clear
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 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 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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-row-rd.shader_test
index 01a1d844..e93296fa 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -75,8 +76,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -91,3 +92,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-rd.shader_test
index e1168986..2d9fbdea 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -46,55 +48,55 @@ uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 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 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 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 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 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-row-rd.shader_test
index db1eccfa..5bcd72c3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -63,8 +64,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -79,8 +80,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -95,12 +96,12 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -115,8 +116,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -131,8 +132,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -147,12 +148,12 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 19
 draw rect 115 5 10 10
@@ -167,8 +168,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -183,8 +184,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -199,3 +200,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-rd.shader_test
index 6369b28c..43a64fd0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 uniform mat3 m[3];
@@ -43,23 +45,23 @@ uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-row-rd.shader_test
index 8448b564..8cfdeab2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -60,11 +61,11 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 1
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -79,11 +80,11 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 2
-
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -98,3 +99,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-rd.shader_test
index 10237634..6634ab77 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 uniform mat3 m[3];
 varying vec4 color;
@@ -39,7 +41,7 @@ clear
 
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
-
 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-row-rd.shader_test
index ba97dd78..696b6b20 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat3 m[3];
@@ -41,7 +43,6 @@ clear
 
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -56,3 +57,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-rd.shader_test
index 8464c055..69760674 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 uniform mat4 m[3];
@@ -42,22 +44,22 @@ clear
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 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 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 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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-row-rd.shader_test
index aea91be0..7da3a2b3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -85,8 +86,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -106,8 +107,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -127,3 +128,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-rd.shader_test
index 4c2e0453..5a6463e2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -46,70 +48,70 @@ uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0
 uniform mat4x4 m[2] 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
 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 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 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 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 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 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 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 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 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 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-row-rd.shader_test
index 2c5d96bb..be0a8892 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -48,7 +50,6 @@ uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0
 uniform mat4x4 m[2] 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
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -68,8 +69,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -89,8 +90,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -110,8 +111,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -131,12 +132,12 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -156,8 +157,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -177,8 +178,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -198,8 +199,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -219,12 +220,12 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 33
 draw rect 145 5 10 10
@@ -244,8 +245,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -265,8 +266,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -286,8 +287,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -307,3 +308,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-rd.shader_test
index 3dee0f7d..9e0f3f08 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 uniform mat4 m[3];
@@ -43,23 +45,23 @@ uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-row-rd.shader_test
index 30a95654..74126cdc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -65,11 +66,11 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 1
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -89,11 +90,11 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 2
-
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -113,3 +114,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-rd.shader_test
index e8020c99..d1ca7067 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 uniform mat4 m[3];
 varying vec4 color;
@@ -39,7 +41,7 @@ clear
 
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
-
 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-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-row-rd.shader_test
index c24dd0e1..276d0632 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat4 m[3];
@@ -41,7 +43,6 @@ clear
 
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -61,3 +62,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-rd.shader_test
index 35cb746a..54899368 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 uniform mat2 m;
@@ -41,12 +43,12 @@ clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.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 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-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-row-rd.shader_test
index b0275e6d..cdfce4f4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -53,8 +54,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -64,3 +65,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-rd.shader_test
index 041fd954..490d13b0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 uniform mat2 m;
 varying vec4 color;
@@ -38,7 +40,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
-
 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-es-1.00/execution/variable-index-read/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-row-rd.shader_test
index 924b394d..ad433644 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat2 m;
@@ -40,7 +42,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -50,3 +51,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-rd.shader_test
index 4e7f9adb..fda3b374 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 uniform mat3 m;
@@ -41,17 +43,17 @@ clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.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 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 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-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-row-rd.shader_test
index 604eae55..ffe08b1c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -58,8 +59,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -74,8 +75,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -90,3 +91,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-rd.shader_test
index 7979cab4..e3b93e7d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 uniform mat3 m;
 varying vec4 color;
@@ -38,7 +40,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
-
 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-es-1.00/execution/variable-index-read/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-row-rd.shader_test
index 1c27ea22..4d859ff8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat3 m;
@@ -40,7 +42,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -55,3 +56,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-rd.shader_test
index 20419a0e..7cc38399 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 uniform mat4 m;
@@ -41,22 +43,22 @@ clear
 
 uniform mat4x4 m 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
 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 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 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 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-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-row-rd.shader_test
index 57d68439..44852147 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear
 
 uniform mat4x4 m 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
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -63,8 +64,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -84,8 +85,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -105,8 +106,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -126,3 +127,4 @@ 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-es-1.00/execution/variable-index-read/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-rd.shader_test
index d773efcb..1c07aff6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -23,6 +23,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 uniform mat4 m;
 varying vec4 color;
@@ -38,7 +40,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat4x4 m 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
-
 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-es-1.00/execution/variable-index-read/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-row-rd.shader_test
index dc168edc..88f44823 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-uniform-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -24,6 +24,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat4 m;
@@ -40,7 +42,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat4x4 m 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
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -60,3 +61,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-rd.shader_test
index 345720d4..e3f81e81 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying mat2 m[3];
@@ -44,12 +46,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-row-rd.shader_test
index fb813ade..df8eb6f7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -56,8 +57,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -67,3 +68,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-rd.shader_test
index c7aaefce..08111320 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -47,34 +49,34 @@ clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-row-rd.shader_test
index f564538f..dacd4df4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -70,9 +71,9 @@ 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
@@ -82,8 +83,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -93,9 +94,9 @@ 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
@@ -105,8 +106,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -116,3 +117,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-rd.shader_test
index e1924c08..f865a233 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 varying mat2 m[3];
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-row-rd.shader_test
index c658ffaf..3c03f1d6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -56,8 +57,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -67,8 +68,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -78,3 +79,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-rd.shader_test
index fb22ed81..c9180468 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying mat2 m[3];
 varying vec4 color;
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-row-rd.shader_test
index ca328179..70252fb3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat2 m[3];
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -53,3 +54,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-rd.shader_test
index 80adbb56..2f7fcc86 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying mat3 m[3];
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-row-rd.shader_test
index a73edacf..722fc533 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -61,8 +62,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -77,8 +78,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -93,3 +94,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-rd.shader_test
index 95993c96..c3fa6049 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -47,49 +49,49 @@ clear
 
 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-row-rd.shader_test
index b0afc303..7a6ea946 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -80,8 +81,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -96,9 +97,9 @@ 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
@@ -113,8 +114,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -129,8 +130,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -145,9 +146,9 @@ 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
@@ -162,8 +163,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -178,8 +179,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -194,3 +195,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-rd.shader_test
index 8ce845ed..d2967355 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 varying mat3 m[3];
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-row-rd.shader_test
index 6d61181d..ddcac9a5 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -61,8 +62,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -77,8 +78,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -93,3 +94,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-rd.shader_test
index cbae8d0f..ecccfe44 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying mat3 m[3];
 varying vec4 color;
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-row-rd.shader_test
index 85f4be0c..89812eed 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat3 m[3];
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -58,3 +59,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-rd.shader_test
index 47bb1c1f..35acdb5a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying mat4 m[3];
@@ -44,22 +46,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-row-rd.shader_test
index 2e2e8b37..9721af85 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -66,8 +67,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -87,8 +88,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -108,8 +109,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -129,3 +130,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-rd.shader_test
index 9fa387e8..e404d233 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -47,64 +49,64 @@ clear
 
 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 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 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 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-row-rd.shader_test
index c98cb7b4..44690795 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -69,8 +70,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -90,8 +91,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -111,8 +112,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -132,9 +133,9 @@ 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
@@ -154,8 +155,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -175,8 +176,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -196,8 +197,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -217,9 +218,9 @@ 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
@@ -239,8 +240,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -260,8 +261,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -281,8 +282,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -302,3 +303,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-rd.shader_test
index 9016290a..d72a923e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 varying mat4 m[3];
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-row-rd.shader_test
index 26482211..a4fb41da 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -66,8 +67,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -87,8 +88,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -108,3 +109,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-rd.shader_test
index 7c958d6d..b577f0d8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying mat4 m[3];
 varying vec4 color;
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-row-rd.shader_test
index fc365882..f5ab0734 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat4 m[3];
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -63,3 +64,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-rd.shader_test
index d9b50bde..bbc8c2c7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying mat2 m;
@@ -42,12 +44,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-row-rd.shader_test
index c3045d1e..89feb4cd 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -54,8 +55,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -65,3 +66,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-rd.shader_test
index 0616aa52..7b7c0d52 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying mat2 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-row-rd.shader_test
index 6fadf382..4ba49e8e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat2 m;
@@ -41,7 +43,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -51,3 +52,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-rd.shader_test
index 0ac2d820..098c89ea 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying mat3 m;
@@ -42,17 +44,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-row-rd.shader_test
index 23824e23..1001ffa6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -75,8 +76,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -91,3 +92,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-rd.shader_test
index 7362e763..fa9b8223 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying mat3 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-row-rd.shader_test
index 261bd16b..01bfbbbe 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat3 m;
@@ -41,7 +43,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -56,3 +57,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-rd.shader_test
index 02b713fe..8f6ab619 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying mat4 m;
@@ -42,22 +44,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-row-rd.shader_test
index c618eed9..c32e3c0e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -85,8 +86,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -106,8 +107,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -127,3 +128,4 @@ 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-es-1.00/execution/variable-index-read/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-rd.shader_test
index b7face91..3fe5bcb2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying mat4 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-row-rd.shader_test
index 88801f12..29cce791 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/fs-varying-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat4 m;
@@ -41,7 +43,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -61,3 +62,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-rd.shader_test
index 2c6808ae..88202244 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying vec4 color;
@@ -44,12 +46,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-row-rd.shader_test
index 1652f9dc..b68612d5 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -56,8 +57,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -67,3 +68,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-rd.shader_test
index 14eb9f84..f2392760 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -47,34 +49,34 @@ clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-row-rd.shader_test
index 75a5ce94..ac91908b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -32,6 +32,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -70,9 +71,9 @@ 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
@@ -82,8 +83,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -93,9 +94,9 @@ 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
@@ -105,8 +106,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -116,3 +117,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-rd.shader_test
index a509027e..b54e4375 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 varying vec4 color;
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-row-rd.shader_test
index 2eeb3f3f..5423e344 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -56,8 +57,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -67,8 +68,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -78,3 +79,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-rd.shader_test
index d8a03609..5c5a59bf 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying vec4 color;
 
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-row-rd.shader_test
index 48144ba7..8eeed6c7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -53,3 +54,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-rd.shader_test
index c9813cab..cefabeed 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying vec4 color;
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-row-rd.shader_test
index 74d193ee..d14e547b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -61,8 +62,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -77,8 +78,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -93,3 +94,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-rd.shader_test
index fcf40606..6ae7e0e6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -47,49 +49,49 @@ clear
 
 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-row-rd.shader_test
index b1a3b104..22dee0a2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -32,6 +32,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -80,8 +81,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -96,9 +97,9 @@ 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
@@ -113,8 +114,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -129,8 +130,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -145,9 +146,9 @@ 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
@@ -162,8 +163,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -178,8 +179,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -194,3 +195,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-rd.shader_test
index 4a8eaa56..67e43671 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 varying vec4 color;
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-row-rd.shader_test
index 56d0276b..27e4325d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -61,8 +62,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -77,8 +78,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -93,3 +94,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-rd.shader_test
index f857900d..8b6f0146 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying vec4 color;
 
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-row-rd.shader_test
index 697a7532..e0b700d1 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -58,3 +59,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-rd.shader_test
index 9984c6e3..ba72275e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying vec4 color;
@@ -44,22 +46,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-row-rd.shader_test
index 6ae826df..aa26b87b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -66,8 +67,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -87,8 +88,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -108,8 +109,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -129,3 +130,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-rd.shader_test
index 25f12f15..8147e8ab 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -47,64 +49,64 @@ clear
 
 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 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 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 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-row-rd.shader_test
index 8687ccc6..a0a3f504 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -32,6 +32,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -69,8 +70,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -90,8 +91,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -111,8 +112,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -132,9 +133,9 @@ 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
@@ -154,8 +155,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -175,8 +176,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -196,8 +197,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -217,9 +218,9 @@ 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
@@ -239,8 +240,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -260,8 +261,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -281,8 +282,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -302,3 +303,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-rd.shader_test
index 39991370..32d6d3ac 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 varying vec4 color;
@@ -44,17 +46,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-row-rd.shader_test
index 9b296e72..de693599 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -31,6 +31,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -66,8 +67,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -87,8 +88,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -108,3 +109,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-rd.shader_test
index 502cca8b..02fe32b0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -29,6 +29,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying vec4 color;
 
@@ -41,7 +43,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-row-rd.shader_test
index d32a2708..8a7e217b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -30,6 +30,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -43,7 +45,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -63,3 +64,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-rd.shader_test
index 9c7a0eab..a42269d6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying vec4 color;
@@ -41,12 +43,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-row-rd.shader_test
index 9f44b385..184b76d2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -53,8 +54,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -64,3 +65,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-rd.shader_test
index 451397ff..41f45281 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying vec4 color;
 
@@ -38,7 +40,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-row-rd.shader_test
index 5584a5cc..787caaf9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -40,7 +42,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -50,3 +51,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-rd.shader_test
index 1350d1c5..3e07a8ec 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying vec4 color;
@@ -41,17 +43,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-row-rd.shader_test
index 9e8752cd..35f99ad1 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -58,8 +59,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -74,8 +75,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -90,3 +91,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-rd.shader_test
index ae600d45..d984b859 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying vec4 color;
 
@@ -38,7 +40,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-row-rd.shader_test
index 22debc3e..b32e044a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -40,7 +42,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -55,3 +56,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-rd.shader_test
index cf748be4..514bf29f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying vec4 color;
@@ -41,22 +43,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-row-rd.shader_test
index 803707f2..d5fab50f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -43,7 +45,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -63,8 +64,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -84,8 +85,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -105,8 +106,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -126,3 +127,4 @@ 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-es-1.00/execution/variable-index-read/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-rd.shader_test
index 991c75e6..6f7b0ea8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying vec4 color;
 
@@ -38,7 +40,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-row-rd.shader_test
index 08073beb..d2fb6843 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-temp-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying vec4 color;
@@ -40,7 +42,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -60,3 +61,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-rd.shader_test
index 2c332e90..46e3764c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 uniform mat2 m[3];
@@ -43,12 +45,12 @@ clear
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-row-rd.shader_test
index bf11b0d1..04d4b872 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -55,8 +56,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -66,3 +67,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-rd.shader_test
index 449575a9..d3a9f4c2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -47,40 +49,40 @@ uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 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 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-row-rd.shader_test
index ff67b649..b682ba8d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -70,12 +71,12 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -85,8 +86,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -96,12 +97,12 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 9
 draw rect 85 5 10 10
@@ -111,8 +112,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -122,3 +123,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-rd.shader_test
index 29d39948..2ffffd9e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 uniform mat2 m[3];
@@ -44,23 +46,23 @@ uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-row-rd.shader_test
index 0a7190a3..2d4e8bbf 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -56,11 +57,11 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 1
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -70,11 +71,11 @@ 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 mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
 uniform mat2x2 m[2] 9.0 10.0 11.0 12.0
 uniform int index 2
-
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -84,3 +85,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-rd.shader_test
index 65c7062a..560d5910 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 uniform mat2 m[3];
 varying vec4 color;
@@ -40,7 +42,7 @@ clear
 
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
-
 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-row-rd.shader_test
index e99e456d..c31e6a4e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat2 m[3];
@@ -42,7 +44,6 @@ clear
 
 uniform mat2x2 m[0] 1.0 2.0 3.0 4.0
 uniform mat2x2 m[1] 5.0 6.0 7.0 8.0
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -52,3 +53,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-rd.shader_test
index d9a28e55..5d645e9d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 uniform mat3 m[3];
@@ -43,17 +45,17 @@ clear
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 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 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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-row-rd.shader_test
index 868ebe49..7dc8ebd2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -60,8 +61,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -76,8 +77,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -92,3 +93,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-rd.shader_test
index 4e4d2db2..b3a260f0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -47,55 +49,55 @@ uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 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 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 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 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 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-row-rd.shader_test
index 9f745457..6d732b3c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -80,8 +81,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -96,12 +97,12 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -116,8 +117,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -132,8 +133,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -148,12 +149,12 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 19
 draw rect 115 5 10 10
@@ -168,8 +169,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -184,8 +185,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -200,3 +201,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-rd.shader_test
index f9ca373e..feff5ccc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 uniform mat3 m[3];
@@ -44,23 +46,23 @@ uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-row-rd.shader_test
index cde3f2af..5b3a695d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -61,11 +62,11 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 1
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -80,11 +81,11 @@ 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 mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
 uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0
 uniform int index 2
-
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -99,3 +100,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-rd.shader_test
index aa6a247e..a87db7bf 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 uniform mat3 m[3];
 varying vec4 color;
@@ -40,7 +42,7 @@ clear
 
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
-
 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-row-rd.shader_test
index c52ac391..a58816f7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat3 m[3];
@@ -42,7 +44,6 @@ clear
 
 uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -57,3 +58,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-rd.shader_test
index 6af6f1f1..b0f36e44 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 uniform mat4 m[3];
@@ -43,22 +45,22 @@ clear
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 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 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 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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-row-rd.shader_test
index acadec53..1ce727a7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -45,7 +47,6 @@ clear
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -65,8 +66,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -86,8 +87,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -107,8 +108,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -128,3 +129,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-rd.shader_test
index 91bfb99b..abcae263 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -47,70 +49,70 @@ uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0
 uniform mat4x4 m[2] 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
 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 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 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 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 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 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 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 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 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 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-row-rd.shader_test
index 3d378f49..e64f4e24 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -28,6 +28,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -49,7 +51,6 @@ uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0
 uniform mat4x4 m[2] 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
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -69,8 +70,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -90,8 +91,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -111,8 +112,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -132,12 +133,12 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 1
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -157,8 +158,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -178,8 +179,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -199,8 +200,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -220,12 +221,12 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 2
 uniform int col 0
-
 uniform int row 0
 uniform float expect 33
 draw rect 145 5 10 10
@@ -245,8 +246,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -266,8 +267,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -287,8 +288,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -308,3 +309,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-rd.shader_test
index 1493e745..91c200ea 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 uniform mat4 m[3];
@@ -44,23 +46,23 @@ uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-row-rd.shader_test
index e432ded2..f3ef9159 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -46,7 +48,6 @@ uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -66,11 +67,11 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 1
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -90,11 +91,11 @@ 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 mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
 uniform mat4x4 m[2] 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
 uniform int index 2
-
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -114,3 +115,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-rd.shader_test
index 56a73c4e..7a70799b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 uniform mat4 m[3];
 varying vec4 color;
@@ -40,7 +42,7 @@ clear
 
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
-
 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-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-row-rd.shader_test
index e9b432fe..e05d0035 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat4 m[3];
@@ -42,7 +44,6 @@ clear
 
 uniform mat4x4 m[0] 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
 uniform mat4x4 m[1] 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
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -62,3 +63,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-rd.shader_test
index 637a6e15..34aeb0cb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 uniform mat2 m;
@@ -42,12 +44,12 @@ clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.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 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-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-row-rd.shader_test
index 121a09c6..3a9062e8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -54,8 +55,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -65,3 +66,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-rd.shader_test
index 90351341..178ced8f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 uniform mat2 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
-
 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-es-1.00/execution/variable-index-read/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-row-rd.shader_test
index 4ecf8401..74fe9192 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat2 m;
@@ -41,7 +43,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat2x2 m 1.0 2.0 3.0 4.0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -51,3 +52,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-rd.shader_test
index 92d1d599..161e7fe0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 uniform mat3 m;
@@ -42,17 +44,17 @@ clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.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 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 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-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-row-rd.shader_test
index 8261a656..d5ce061c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -59,8 +60,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -75,8 +76,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -91,3 +92,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-rd.shader_test
index 946731a0..9a46b65c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 uniform mat3 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
-
 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-es-1.00/execution/variable-index-read/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-row-rd.shader_test
index 683fc482..3b4bc17d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat3 m;
@@ -41,7 +43,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -56,3 +57,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-rd.shader_test
index 2ff1b5c9..99551564 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 uniform mat4 m;
@@ -42,22 +44,22 @@ clear
 
 uniform mat4x4 m 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
 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 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 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 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-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-row-rd.shader_test
index 0ce18a4b..c2c182c9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -27,6 +27,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -44,7 +46,6 @@ clear
 
 uniform mat4x4 m 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
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -64,8 +65,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -85,8 +86,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -106,8 +107,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -127,3 +128,4 @@ 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-es-1.00/execution/variable-index-read/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-rd.shader_test
index 963a5e1a..f2617f2f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -25,6 +25,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 uniform mat4 m;
 varying vec4 color;
@@ -39,7 +41,7 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat4x4 m 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
-
 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-es-1.00/execution/variable-index-read/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-row-rd.shader_test
index ac594e21..b74fbc52 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-uniform-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -26,6 +26,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 uniform mat4 m;
@@ -41,7 +43,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform mat4x4 m 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
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -61,3 +62,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-rd.shader_test
index 2fafbbf0..5ec85ef2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying mat2 m[3];
@@ -60,12 +62,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-row-rd.shader_test
index 8fdd589c..abb76486 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 45 5 10 10
@@ -72,8 +73,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -83,3 +84,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-rd.shader_test
index 466cc299..be7624c9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec2 expect;
@@ -63,34 +65,34 @@ clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-row-rd.shader_test
index 4e543b5d..b9f2791f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -40,6 +40,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -65,7 +67,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -75,8 +76,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -86,9 +87,9 @@ 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
@@ -98,8 +99,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -109,9 +110,9 @@ 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
@@ -121,8 +122,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -132,3 +133,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-rd.shader_test
index bbc7a601..0f4c224a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec2 expect;
 varying mat2 m[3];
@@ -60,17 +62,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-row-rd.shader_test
index 2ecb945b..91f18b8f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -72,8 +73,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -83,8 +84,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 11
 draw rect 100 5 10 10
@@ -94,3 +95,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-rd.shader_test
index e9c87734..c0ee06a3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying mat2 m[3];
 varying vec4 color;
@@ -57,7 +59,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-row-rd.shader_test
index 59358d71..7166226d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat2 m[3];
@@ -59,7 +61,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 7
 draw rect 60 5 10 10
@@ -69,3 +70,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-rd.shader_test
index eebbee22..87f249e3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying mat3 m[3];
@@ -60,17 +62,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-row-rd.shader_test
index 3090930b..e60c4641 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 10
 draw rect 60 5 10 10
@@ -77,8 +78,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -93,8 +94,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -109,3 +110,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-rd.shader_test
index a4786399..c3ffe506 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec3 expect;
@@ -63,49 +65,49 @@ clear
 
 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-row-rd.shader_test
index e39d2e43..c504dd1e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -40,6 +40,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -65,7 +67,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -80,8 +81,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -96,8 +97,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -112,9 +113,9 @@ 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
@@ -129,8 +130,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -145,8 +146,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 16
 draw rect 90 5 10 10
@@ -161,9 +162,9 @@ 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
@@ -178,8 +179,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -194,8 +195,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 145 5 10 10
@@ -210,3 +211,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-rd.shader_test
index 2fc8d61a..296d15e5 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec3 expect;
 varying mat3 m[3];
@@ -60,17 +62,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-row-rd.shader_test
index 06e3356b..006f2b74 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -77,8 +78,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -93,8 +94,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 22
 draw rect 130 5 10 10
@@ -109,3 +110,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-rd.shader_test
index 7b2d40bd..7add766c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying mat3 m[3];
 varying vec4 color;
@@ -57,7 +59,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-row-rd.shader_test
index a2051f24..2d44ff82 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat3 m[3];
@@ -59,7 +61,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 13
 draw rect 75 5 10 10
@@ -74,3 +75,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-rd.shader_test
index e8ca171e..0264a392 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying mat4 m[3];
@@ -60,22 +62,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-row-rd.shader_test
index cd5be7b8..b5e83bd9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 17
 draw rect 75 5 10 10
@@ -82,8 +83,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -103,8 +104,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -124,8 +125,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -145,3 +146,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-rd.shader_test
index 8e53dcdf..b6a2980b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform vec4 expect;
@@ -63,64 +65,64 @@ clear
 
 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 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 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 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 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 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 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 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-row-rd.shader_test
index 110cf554..96afd020 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -40,6 +40,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int col;
 uniform int row;
@@ -65,7 +67,6 @@ clear
 
 uniform int index 0
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -85,8 +86,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -106,8 +107,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -127,8 +128,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -148,9 +149,9 @@ 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
@@ -170,8 +171,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -191,8 +192,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 25
 draw rect 105 5 10 10
@@ -212,8 +213,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 29
 draw rect 120 5 10 10
@@ -233,9 +234,9 @@ 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
@@ -255,8 +256,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -276,8 +277,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 41
 draw rect 175 5 10 10
@@ -297,8 +298,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 45
 draw rect 190 5 10 10
@@ -318,3 +319,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-rd.shader_test
index 1e3ddc19..b3d2dfff 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform vec4 expect;
 varying mat4 m[3];
@@ -60,17 +62,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-row-rd.shader_test
index 5cb0fabb..59042fdb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-index-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -39,6 +39,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int index;
 uniform int row;
 uniform float expect;
@@ -62,7 +64,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int index 0
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -82,8 +83,8 @@ 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 index 1
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -103,8 +104,8 @@ 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 index 2
 uniform int row 0
 uniform float expect 37
 draw rect 160 5 10 10
@@ -124,3 +125,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-rd.shader_test
index 59d54edb..1f1c767f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying mat4 m[3];
 varying vec4 color;
@@ -57,7 +59,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-row-rd.shader_test
index f2142619..a3c49f4a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-array-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -38,6 +38,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat4 m[3];
@@ -59,7 +61,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 21
 draw rect 90 5 10 10
@@ -79,3 +80,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-rd.shader_test
index 7b04b557..c9a76634 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec2 expect;
 varying mat2 m;
@@ -58,12 +60,12 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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-es-1.00/execution/variable-index-read/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-row-rd.shader_test
index 2ba42563..c1182b94 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -60,7 +62,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -70,8 +71,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -81,3 +82,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-rd.shader_test
index 14e295fa..d0d8be1e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec2 expect;
 varying mat2 m;
 varying vec4 color;
@@ -55,7 +57,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-row-rd.shader_test
index 4b4be284..002cf6c6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat2-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat2 m;
@@ -57,7 +59,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 3
 draw rect 20 5 10 10
@@ -67,3 +68,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-rd.shader_test
index 0295b4b4..ff99230b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec3 expect;
 varying mat3 m;
@@ -58,17 +60,17 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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-es-1.00/execution/variable-index-read/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-row-rd.shader_test
index 4baab1a6..cb895861 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -60,7 +62,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -75,8 +76,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -91,8 +92,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 7
 draw rect 35 5 10 10
@@ -107,3 +108,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-rd.shader_test
index a6210f42..3e853d55 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec3 expect;
 varying mat3 m;
 varying vec4 color;
@@ -55,7 +57,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-row-rd.shader_test
index 97a9f93f..fd7d82f4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat3-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat3 m;
@@ -57,7 +59,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 4
 draw rect 20 5 10 10
@@ -72,3 +73,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-rd.shader_test
index d3fd4e64..3b1c5c06 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform vec4 expect;
 varying mat4 m;
@@ -58,22 +60,22 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 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 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 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 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-es-1.00/execution/variable-index-read/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-row-rd.shader_test
index 3412bc35..36a0716c 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-col-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -37,6 +37,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int col;
 uniform int row;
 uniform float expect;
@@ -60,7 +62,6 @@ clear color 0.5 0.5 0.5 0.5
 clear
 
 uniform int col 0
-
 uniform int row 0
 uniform float expect 1
 draw rect 5 5 10 10
@@ -80,8 +81,8 @@ 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 col 1
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -101,8 +102,8 @@ 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 col 2
 uniform int row 0
 uniform float expect 9
 draw rect 35 5 10 10
@@ -122,8 +123,8 @@ 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 col 3
 uniform int row 0
 uniform float expect 13
 draw rect 50 5 10 10
@@ -143,3 +144,4 @@ 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-es-1.00/execution/variable-index-read/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-rd.shader_test
index 989c779c..08077793 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform vec4 expect;
 varying mat4 m;
 varying vec4 color;
@@ -55,7 +57,7 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 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-es-1.00/execution/variable-index-read/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-row-rd.shader_test
index 341606d3..6849e81d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-read/vs-varying-mat4-row-rd.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../variable-index-read.sh 1.00
+# ../../../glsl-1.10/variable-index-read.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform int row;
 uniform float expect;
 varying mat4 m;
@@ -57,7 +59,6 @@ void main()
 clear color 0.5 0.5 0.5 0.5
 clear
 
-
 uniform int row 0
 uniform float expect 5
 draw rect 20 5 10 10
@@ -77,3 +78,4 @@ 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-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-row-wr.shader_test
index f482d064..9592f001 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -88,4 +90,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-wr.shader_test
index 944d03a8..bdccee7d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -69,4 +71,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-row-wr.shader_test
index 2f711792..7ac1b35f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -159,4 +161,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-wr.shader_test
index 0dcc8278..b5b68263 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -104,4 +106,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-row-wr.shader_test
index 34826aed..fdec66fc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -105,4 +107,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-wr.shader_test
index 8d760755..e1a8efa5 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -77,4 +79,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-row-wr.shader_test
index 2eca3c0e..28c02be9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -70,4 +72,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-wr.shader_test
index 642b4ca4..5d1c7cf8 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -60,4 +62,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-row-wr.shader_test
index 96bc07be..c741183d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -129,4 +131,3 @@ uniform float value 0.270815003356504
 draw rect 90 35 10 10
 probe rgb 95 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-wr.shader_test
index 699eabb9..5c132ab9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -77,4 +79,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-row-wr.shader_test
index 137c20f3..04a24a0b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -282,4 +284,3 @@ uniform float value 0.270815003356504
 draw rect 145 35 10 10
 probe rgb 150 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-wr.shader_test
index 000d35fe..6aebf80f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -128,4 +130,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 145 5 10 10
 probe rgb 150 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-row-wr.shader_test
index b6956113..05321c50 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -129,4 +131,3 @@ uniform float value 0.467616286531193
 draw rect 130 35 10 10
 probe rgb 135 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-wr.shader_test
index 408b3f53..72668608 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -77,4 +79,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 130 5 10 10
 probe rgb 135 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-row-wr.shader_test
index fb1ccc93..36029130 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -78,4 +80,3 @@ uniform float value 0.467616286531193
 draw rect 75 35 10 10
 probe rgb 80 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-wr.shader_test
index d5f81eea..67f6f407 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -60,4 +62,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 75 5 10 10
 probe rgb 80 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-row-wr.shader_test
index c44c2f80..022a114f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -186,4 +188,3 @@ uniform float value 0.879197364462782
 draw rect 120 50 10 10
 probe rgb 125 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-wr.shader_test
index 40127229..2f78e2f4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -85,4 +87,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 120 5 10 10
 probe rgb 125 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-row-wr.shader_test
index d77bd0e4..925202ec 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -453,4 +455,3 @@ uniform float value 0.879197364462782
 draw rect 190 50 10 10
 probe rgb 195 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-wr.shader_test
index aebf948c..43346f53 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -152,4 +154,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 190 5 10 10
 probe rgb 195 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-row-wr.shader_test
index f6c1ed3f..64d1d032 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -153,4 +155,3 @@ uniform float value 0.693273570571311
 draw rect 160 50 10 10
 probe rgb 165 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-wr.shader_test
index ab41a4bb..772de8bc 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -77,4 +79,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 160 5 10 10
 probe rgb 165 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-row-wr.shader_test
index 15ec78a6..eb290b76 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -86,4 +88,3 @@ uniform float value 0.693273570571311
 draw rect 90 50 10 10
 probe rgb 95 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-wr.shader_test
index 47a3b0e8..d01ba1de 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-array-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -60,4 +62,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-row-wr.shader_test
index 0cba79cd..c1c87791 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -80,4 +82,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-wr.shader_test
index 1b57de0a..38aee9cf 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -61,4 +63,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-row-wr.shader_test
index 67415c1d..fff97307 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -62,4 +64,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-wr.shader_test
index 6be9e207..dcaf8072 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -52,4 +54,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-row-wr.shader_test
index 7d9108d0..9139656f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -121,4 +123,3 @@ uniform float value 0.270815003356504
 draw rect 35 35 10 10
 probe rgb 40 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-wr.shader_test
index b91cfe1b..2f0732d7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -69,4 +71,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 35 5 10 10
 probe rgb 40 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-row-wr.shader_test
index d530b7d3..e282814e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -70,4 +72,3 @@ uniform float value 0.467616286531193
 draw rect 20 35 10 10
 probe rgb 25 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-wr.shader_test
index 93723630..ab6510fe 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -52,4 +54,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-row-wr.shader_test
index 295138e4..eefaddb9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -178,4 +180,3 @@ uniform float value 0.879197364462782
 draw rect 50 50 10 10
 probe rgb 55 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-wr.shader_test
index 99b43711..09fe61a0 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -77,4 +79,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 50 5 10 10
 probe rgb 55 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-row-wr.shader_test
index 9d369791..0ad43e12 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -78,4 +80,3 @@ uniform float value 0.693273570571311
 draw rect 20 50 10 10
 probe rgb 25 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-wr.shader_test
index 2d551994..77f25576 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/fs-temp-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -20,6 +20,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -52,4 +54,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-row-wr.shader_test
index d52314e8..79e3b408 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -86,4 +86,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-wr.shader_test
index 684b8ee4..4272afa6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -67,4 +67,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-row-wr.shader_test
index fc8a003d..e9b34136 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -157,4 +157,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-wr.shader_test
index e660e052..1dd5c52e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -102,4 +102,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-row-wr.shader_test
index 9afaa25e..02c002c3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -103,4 +103,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-wr.shader_test
index 99b01b3f..9fd0615a 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -75,4 +75,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-row-wr.shader_test
index c358a06e..ffbc8343 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -68,4 +68,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-wr.shader_test
index 0bd114fe..017ea77d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -58,4 +58,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-row-wr.shader_test
index 6c8ca040..92b77097 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -127,4 +127,3 @@ uniform float value 0.270815003356504
 draw rect 90 35 10 10
 probe rgb 95 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-wr.shader_test
index c45ff75d..b65eeb38 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -75,4 +75,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-row-wr.shader_test
index 99f625d5..44c621d7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -280,4 +280,3 @@ uniform float value 0.270815003356504
 draw rect 145 35 10 10
 probe rgb 150 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-wr.shader_test
index 5c399324..d195e08e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -126,4 +126,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 145 5 10 10
 probe rgb 150 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-row-wr.shader_test
index 0dda3971..abd80751 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -127,4 +127,3 @@ uniform float value 0.467616286531193
 draw rect 130 35 10 10
 probe rgb 135 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-wr.shader_test
index cfdecb7d..edf376f7 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -75,4 +75,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 130 5 10 10
 probe rgb 135 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-row-wr.shader_test
index 4db3f072..a2900381 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -76,4 +76,3 @@ uniform float value 0.467616286531193
 draw rect 75 35 10 10
 probe rgb 80 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-wr.shader_test
index 6e152156..de6a0479 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -58,4 +58,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 75 5 10 10
 probe rgb 80 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-row-wr.shader_test
index b8e92f82..f7cae9c4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -184,4 +184,3 @@ uniform float value 0.879197364462782
 draw rect 120 50 10 10
 probe rgb 125 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-wr.shader_test
index 0ef05bb9..d6424767 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -83,4 +83,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 120 5 10 10
 probe rgb 125 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-row-wr.shader_test
index 1fc1bc96..ece58c4d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -451,4 +451,3 @@ uniform float value 0.879197364462782
 draw rect 190 50 10 10
 probe rgb 195 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-wr.shader_test
index 89e5ae22..6a7e1606 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -150,4 +150,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 190 5 10 10
 probe rgb 195 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-row-wr.shader_test
index 80e3280d..c2f86fd4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -151,4 +151,3 @@ uniform float value 0.693273570571311
 draw rect 160 50 10 10
 probe rgb 165 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-wr.shader_test
index 9158257a..79ddae0e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -75,4 +75,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 160 5 10 10
 probe rgb 165 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-row-wr.shader_test
index 63fe6e23..3b8208a3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -84,4 +84,3 @@ uniform float value 0.693273570571311
 draw rect 90 50 10 10
 probe rgb 95 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-wr.shader_test
index 4b4a435e..9e724636 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-array-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -58,4 +58,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-row-wr.shader_test
index b6f3c947..d00374f9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -78,4 +78,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-wr.shader_test
index f2922468..81bb0f4b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -59,4 +59,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-row-wr.shader_test
index 772e0255..a8ccc132 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -60,4 +60,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-wr.shader_test
index cc2669e0..59f3b021 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -50,4 +50,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-row-wr.shader_test
index 7b77b01b..34a76904 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -119,4 +119,3 @@ uniform float value 0.270815003356504
 draw rect 35 35 10 10
 probe rgb 40 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-wr.shader_test
index 2b7a7916..addb3694 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -67,4 +67,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 35 5 10 10
 probe rgb 40 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-row-wr.shader_test
index 7bcf0902..425dc9e3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -68,4 +68,3 @@ uniform float value 0.467616286531193
 draw rect 20 35 10 10
 probe rgb 25 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-wr.shader_test
index c915e4e4..50ac2ab4 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -50,4 +50,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-row-wr.shader_test
index e50ece74..781dbc75 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -176,4 +176,3 @@ uniform float value 0.879197364462782
 draw rect 50 50 10 10
 probe rgb 55 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-wr.shader_test
index f49eb042..b7309fec 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -75,4 +75,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 50 5 10 10
 probe rgb 55 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-row-wr.shader_test
index 98517543..2c72ee6b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -76,4 +76,3 @@ uniform float value 0.693273570571311
 draw rect 20 50 10 10
 probe rgb 25 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-wr.shader_test
index f26d1af4..c641b81d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-temp-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -50,4 +50,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-row-wr.shader_test
index 61e76126..1732b11e 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -97,4 +99,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-wr.shader_test
index a804f83c..f048bd24 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -77,4 +79,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-row-wr.shader_test
index 888b779f..f6d65437 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -168,4 +170,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-wr.shader_test
index 82728312..7b9039e2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -112,4 +114,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-row-wr.shader_test
index e6608471..cb78e1e9 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -114,4 +116,3 @@ uniform float value 0.891622340451180
 draw rect 100 20 10 10
 probe rgb 105 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-wr.shader_test
index 4baf85d1..7854139f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -85,4 +87,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 100 5 10 10
 probe rgb 105 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-row-wr.shader_test
index 6ea0cde2..a1fb828b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -79,4 +81,3 @@ uniform float value 0.891622340451180
 draw rect 60 20 10 10
 probe rgb 65 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-wr.shader_test
index 96c8e8b1..0acbb5eb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -68,4 +70,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 60 5 10 10
 probe rgb 65 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-row-wr.shader_test
index a43962e9..26432a53 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -138,4 +140,3 @@ uniform float value 0.270815003356504
 draw rect 90 35 10 10
 probe rgb 95 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-wr.shader_test
index c2ce2611..702e4edb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -85,4 +87,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-row-wr.shader_test
index f2d67aae..79b6f98d 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -291,4 +293,3 @@ uniform float value 0.270815003356504
 draw rect 145 35 10 10
 probe rgb 150 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-wr.shader_test
index 290cd776..0ae391df 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -136,4 +138,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 145 5 10 10
 probe rgb 150 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-row-wr.shader_test
index 45283a10..b1db4b27 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -138,4 +140,3 @@ uniform float value 0.467616286531193
 draw rect 130 35 10 10
 probe rgb 135 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-wr.shader_test
index 8ac59608..73bfa4b2 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -85,4 +87,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 130 5 10 10
 probe rgb 135 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-row-wr.shader_test
index 96934e1e..b0b668ef 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -87,4 +89,3 @@ uniform float value 0.467616286531193
 draw rect 75 35 10 10
 probe rgb 80 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-wr.shader_test
index 90b9625f..0423022b 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -68,4 +70,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 75 5 10 10
 probe rgb 80 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-row-wr.shader_test
index a1e9d66e..1287de99 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -195,4 +197,3 @@ uniform float value 0.879197364462782
 draw rect 120 50 10 10
 probe rgb 125 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-wr.shader_test
index df161751..246dbcd3 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -93,4 +95,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 120 5 10 10
 probe rgb 125 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-row-wr.shader_test
index 53dc42bc..a4702b98 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -462,4 +464,3 @@ uniform float value 0.879197364462782
 draw rect 190 50 10 10
 probe rgb 195 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-wr.shader_test
index 32eb81da..30ca2635 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -160,4 +162,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 190 5 10 10
 probe rgb 195 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-row-wr.shader_test
index 8fc14041..c1c670eb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -162,4 +164,3 @@ uniform float value 0.693273570571311
 draw rect 160 50 10 10
 probe rgb 165 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-wr.shader_test
index efe51dff..67d81984 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-index-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -85,4 +87,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 160 5 10 10
 probe rgb 165 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-row-wr.shader_test
index 24db553f..a5b6fe27 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -44,6 +44,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -95,4 +97,3 @@ uniform float value 0.693273570571311
 draw rect 90 50 10 10
 probe rgb 95 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-wr.shader_test
index a4c2c5fb..a31dd0ca 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-array-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -43,6 +43,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -68,4 +70,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 90 5 10 10
 probe rgb 95 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-row-wr.shader_test
index a0d9e8fe..84b08217 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -88,4 +90,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-wr.shader_test
index 64bea21a..759c1d81 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -68,4 +70,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-row-wr.shader_test
index 509f4599..d07c32fb 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -70,4 +72,3 @@ uniform float value 0.891622340451180
 draw rect 20 20 10 10
 probe rgb 25 25 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-wr.shader_test
index 4b90d87c..2410f85f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat2-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat2 src_matrix;
 uniform vec2 v;
 uniform vec2 expect;
@@ -59,4 +61,3 @@ uniform vec2 value 0.603473877011433 0.891622340451180
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-row-wr.shader_test
index 1045f4f3..b38fa700 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -129,4 +131,3 @@ uniform float value 0.270815003356504
 draw rect 35 35 10 10
 probe rgb 40 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-wr.shader_test
index a7d7a5b8..e56be2b6 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -76,4 +78,3 @@ uniform vec3 value 0.850846377186973 0.511303112962423 0.270815003356504
 draw rect 35 5 10 10
 probe rgb 40 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-row-wr.shader_test
index 7d8d0151..91726144 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -78,4 +80,3 @@ uniform float value 0.467616286531193
 draw rect 20 35 10 10
 probe rgb 25 40 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-wr.shader_test
index 83320c95..e9025482 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat3-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat3 src_matrix;
 uniform vec3 v;
 uniform vec3 expect;
@@ -59,4 +61,3 @@ uniform vec3 value 0.550143078409278 0.591962645398579 0.467616286531193
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-row-wr.shader_test
index f0cc7ba6..79102f51 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -186,4 +188,3 @@ uniform float value 0.879197364462782
 draw rect 50 50 10 10
 probe rgb 55 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-wr.shader_test
index 07e11b2e..a845a315 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-col-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -84,4 +86,3 @@ uniform vec4 value 0.442058176039301 0.829835836794679 0.365674411003021 0.87919
 draw rect 50 5 10 10
 probe rgb 55 10 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-row-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-row-wr.shader_test
index 252341bb..ee936dce 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-row-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-row-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -36,6 +36,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -86,4 +88,3 @@ uniform float value 0.693273570571311
 draw rect 20 50 10 10
 probe rgb 25 55 0.0 1.0 0.0
 
-clear
diff --git a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-wr.shader_test b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-wr.shader_test
index 14896d75..8917689f 100644
--- a/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-wr.shader_test
+++ b/tests/spec/glsl-es-1.00/execution/variable-index-write/vs-varying-mat4-wr.shader_test
@@ -1,5 +1,5 @@
 # Test generated by:
-# ../../variable-index-write.sh 1.00
+# ../../../glsl-1.10/variable-index-write.sh 1.00
 
 [require]
 GLSL ES >= 1.00
@@ -35,6 +35,8 @@ void main()
 }
 
 [fragment shader]
+precision highp float;
+precision highp int;
 uniform mat4 src_matrix;
 uniform vec4 v;
 uniform vec4 expect;
@@ -59,4 +61,3 @@ uniform vec4 value 0.560251913703792 0.171634921595771 0.602494709909111 0.69327
 draw rect 20 5 10 10
 probe rgb 25 10 0.0 1.0 0.0
 
-clear