[Piglit] [PATCH] glsl-1.20: Ensure that uniform array tests declare the array as a uniform
Ian Romanick
idr at freedesktop.org
Mon Aug 22 12:40:11 PDT 2011
From: Ian Romanick <ian.d.romanick at intel.com>
Reported-by: Eric Anholt <eric at anholt.net>
---
tests/spec/glsl-1.10/variable-index-read.sh | 2 +-
.../fs-uniform-array-mat2-col-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-index-col-rd.shader_test | 4 ++--
...uniform-array-mat2-index-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-index-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-index-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-rd.shader_test | 4 ++--
.../fs-uniform-array-mat2-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-col-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-index-col-rd.shader_test | 4 ++--
...uniform-array-mat3-index-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-index-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-index-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-rd.shader_test | 4 ++--
.../fs-uniform-array-mat3-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-col-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-index-col-rd.shader_test | 4 ++--
...uniform-array-mat4-index-col-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-index-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-index-row-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-rd.shader_test | 4 ++--
.../fs-uniform-array-mat4-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-col-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-index-col-rd.shader_test | 4 ++--
...uniform-array-mat2-index-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-index-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-index-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-rd.shader_test | 4 ++--
.../vs-uniform-array-mat2-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-col-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-index-col-rd.shader_test | 4 ++--
...uniform-array-mat3-index-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-index-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-index-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-rd.shader_test | 4 ++--
.../vs-uniform-array-mat3-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-col-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-index-col-rd.shader_test | 4 ++--
...uniform-array-mat4-index-col-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-index-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-index-row-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-rd.shader_test | 4 ++--
.../vs-uniform-array-mat4-row-rd.shader_test | 4 ++--
49 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/tests/spec/glsl-1.10/variable-index-read.sh b/tests/spec/glsl-1.10/variable-index-read.sh
index 903d4e4..4dc6b8d 100755
--- a/tests/spec/glsl-1.10/variable-index-read.sh
+++ b/tests/spec/glsl-1.10/variable-index-read.sh
@@ -81,7 +81,7 @@ function emit_globals
matrix_data 1 $matrix_dim
echo ");"
else
- echo " ${type} m${dim} = ${type}("
+ echo "${mode} ${type} m${dim} = ${type}("
emit_matrix_array_initializer $matrix_dim $array_dim $base_type ""
echo ");"
fi
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test
index 44d6d8f..6d7fb4a 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test
index c810505..25d32df 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test
index 395e84b..30903cd 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test
index f4fd63b..ee39fca 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -27,7 +27,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test
index 8f937e3..5dc8000 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int index;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test
index 4617c77..0a4d22e 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test
index daa8003..5e27571 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -21,7 +21,7 @@ void main()
[fragment shader]
#version 120
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test
index 7d22c3e..4f68406 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test
index 902e117..edecc0c 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test
index 3629ca9..1a47ced 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test
index af467d1..1b66769 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test
index 88402f4..3f6e162 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -27,7 +27,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test
index c686b4f..f09ee1e 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int index;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test
index da109fb..537d1fd 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test
index 93468d0..bbb802c 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -21,7 +21,7 @@ void main()
[fragment shader]
#version 120
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test
index 5f6eef5..fe49c0f 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test
index 867b4a3..fe06740 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test
index d1b6667..65cadd9 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test
index 1112c2a..4a98a0d 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test
index cbc1afc..9ec60bd 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -27,7 +27,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test
index 68f860f..e28a2b6 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int index;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test
index c83031b..192d841 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test
index e0d16a1..cc0ba10 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -21,7 +21,7 @@ void main()
[fragment shader]
#version 120
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test
index b9d0204..cc9dbb7 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -23,7 +23,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test
index d5402a6..6099ee0 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test
index b06fb55..c4001f5 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -27,7 +27,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test
index 047ab96..f2e0cb4 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int col;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test
index 33d8211..0f64c16 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -29,7 +29,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test
index 1660b4c..d3639fa 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int index;
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test
index a76a271..4b06878 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test
index dd57abe..692acf3 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -23,7 +23,7 @@ void main()
[fragment shader]
#version 120
uniform vec2 expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test
index a157b52..4df990f 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat2x2[3] m = mat2x2[3](
+uniform mat2x2[3] m = mat2x2[3](
mat2x2(1.0, 2.0, 3.0, 4.0),
mat2x2(5.0, 6.0, 7.0, 8.0),
mat2x2(9.0, 10.0, 11.0, 12.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test
index 95fab47..221fae7 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test
index 1d9785e..7ddbbf2 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -27,7 +27,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test
index 614d712..a8d264b 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int col;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test
index d5e7564..0b2f2de 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -29,7 +29,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test
index c298e70..6bc5b67 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int index;
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test
index 418a76c..0afb56d 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test
index 856fbc7..fa7de5f 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -23,7 +23,7 @@ void main()
[fragment shader]
#version 120
uniform vec3 expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test
index f340775..307a0f8 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat3x3[3] m = mat3x3[3](
+uniform mat3x3[3] m = mat3x3[3](
mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0),
mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0),
mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test
index c2e5b86..d04821b 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test
index 3d44b03..b7e160a 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -27,7 +27,7 @@ void main()
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test
index eafd32f..1b98eed 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int col;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test
index e95ce56..0cb1bb5 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test
@@ -10,7 +10,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -29,7 +29,7 @@ uniform int index;
uniform int col;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test
index e91cd51..0a70d15 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int index;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int index;
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test
index eeae260..c5df233 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test
@@ -9,7 +9,7 @@ GLSL >= 1.20
uniform int index;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -27,7 +27,7 @@ void main()
uniform int index;
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test
index 46a6f12..04c0134 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test
@@ -7,7 +7,7 @@ GLSL >= 1.20
[vertex shader]
#version 120
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -23,7 +23,7 @@ void main()
[fragment shader]
#version 120
uniform vec4 expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test
index db8940d..9b5ae5c 100644
--- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test
+++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test
@@ -8,7 +8,7 @@ GLSL >= 1.20
#version 120
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
@@ -25,7 +25,7 @@ void main()
#version 120
uniform int row;
uniform float expect;
- mat4x4[3] m = mat4x4[3](
+uniform mat4x4[3] m = mat4x4[3](
mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0),
mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0),
mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0));
--
1.7.4.4
More information about the Piglit
mailing list