diff options
| author | Stuart Abercrombie <sabercrombie@chromium.org> | 2012-12-17 08:40:17 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-12-17 17:18:13 -0800 |
| commit | 9f0753b54d5c12ceaf9684686be53cd86dce7c9f (patch) | |
| tree | 812ff212971c6faf858df46e0c9b479ac0cd5639 | |
| parent | 82773e5715095615b41f90219cb2a06a3d88526a (diff) | |
Remove #version from variable indexing shader tests.
shader_runner will insert #version based on GLSL >=.
Testing: same number of passes on Sandy Bridge.
Signed-off-by: Stuart Abercrombie <sabercrombie@chromium.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Tom Gall <tom.gall@linaro.org>
578 files changed, 36 insertions, 1122 deletions
diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test index 0c37a8b4..789fb92a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test index 4da2b97f..223f27bc 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test index bcb9253f..647cc023 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test index b37196fd..5dd759e1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test index 8d2944f4..62dfd104 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test index 6333f945..53d1502a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test index 309a336f..acc3b779 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test index db13f9b7..4e826869 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test index b5dfc656..10704c91 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test index 111c7ee4..2ea3dbb3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test index 382861a9..e4451a06 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test index 9a50ecd7..079fec36 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test index cca3c57d..600ec874 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test index 6eb35fff..682426e3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test index bdc5113b..479a36a3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test index 364bb083..e7e17cc8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test index 578dd301..9421fd4d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test index b4f06ea9..3bda7cb8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test index 6ddd41b4..b993a57b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test index c7156429..9933f364 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test index 6957f28b..cb5b4f7d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test index ae93756f..33a26f0d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test index 4f1a8fcd..6d5cb6a9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test index f46fa414..5fe13658 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test index 6c6b3f60..b42f5676 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test index a72ab467..1f004920 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test index 37734986..d9d5a9ba 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test index f104e3a3..3f8df00e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test index 185699ac..672a4962 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test index 03d645cb..710fcdbf 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test index 8027907a..b42d6561 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test index 93861c97..d95a370c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test index 904203ef..4d2b5589 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test index 615e5e78..52799654 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test index 7e035abc..b2c5fec1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test index c6860f20..c5dbafac 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test index 5b8c720a..411370ce 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test index a365f36a..839422f3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test index f408484a..e3be0477 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test index 74d8d953..7cd95155 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test index 6a3ccd7e..52a62a9f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test index 9cb578d2..681215df 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test index 473b2d7a..4eb49bc9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test index 6762d63e..58c90cc5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test index 6ef3fc48..2994055d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test index ebe91a3c..85f4a154 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test index 25bbab06..aa7ba8dc 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test index 9ddf8f87..df4529ae 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test index 2a041862..2520a0d6 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test index 12aa2da8..ff170a6e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test index e8de8649..28a79b02 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test index 544b0783..76003d12 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test index 03105b7d..a74c2bf8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test index 9fa74230..1ca63143 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test index 954b78b7..f06d180e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-wr.shader_test index a23dac7f..abfc94a2 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test index 9b18316b..58ba94a1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test index eae9768e..4815ec89 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test index 4ca1f7f5..a4e33ed8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test index 410a355e..93e9235b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test index 71bbb321..a7d108bf 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test index 35d81566..a6226080 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test index 4f2e2690..53e27497 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-wr.shader_test index 855fbedf..557a342a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test index 3bc8e2b9..7db671eb 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test index 0f51c088..9e838a81 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test index ed094bed..7f22a2d5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test index 61151289..2f67f864 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test index 90c7a0ee..b8c807f7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test index 49a55808..3849da4f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test index 0164a105..61b76e95 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-wr.shader_test index ea49ac38..8965d15a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-wr.shader_test @@ -5,11 +5,9 @@ GLSL >= 1.10 [vertex shader] -#version 110 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test index dc81d67d..d640d667 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test index eb5495a8..eff7102c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test index f4322e00..e4a33a42 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test index ff8cd022..baf1124c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test index ffeebba1..54993272 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; uniform mat2 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test index fdd18782..79c6d746 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test index f099e2ea..900a3f3b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; uniform mat2 m[3]; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; uniform mat2 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test index 8208f6f8..eabf8735 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test index a3366d11..b1666643 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test index 2c64e996..3c8dd098 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test index 8acf998a..3083001d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test index ec1bb859..f7783a9e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test index 6dffbb08..227a83eb 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; uniform mat3 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test index 3ef0ae66..1d88b465 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test index 49a6e459..971aa6e2 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; uniform mat3 m[3]; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; uniform mat3 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test index bcb6a494..20669fa0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test index 8bf8590c..1d361388 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test index b222503e..1cc15868 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test index eb77c88f..cb7401fc 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test index cd61894d..f6d5d39f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test index 82c87982..859952fd 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; uniform mat4 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test index 21157aa3..55c396d9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test index e102384d..715cc2a4 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; uniform mat4 m[3]; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; uniform mat4 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test index 72ca8202..72d5efcf 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m[3]; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test index 0249873e..b804dd82 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test index 388b21e7..140b00c8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test index 0625f8b0..d55ef3ac 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; uniform mat2 m; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; uniform mat2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test index fb2175af..eac0f52e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test index 0e4b171a..19e36e18 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test index 1242332f..abe09dae 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test index 694acb22..a96acf78 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; uniform mat3 m; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; uniform mat3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test index 6cdacfb6..4e8d3e60 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test index 7d186f2c..3986b557 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test index 0928e05a..9212cd89 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test index ee7d7bf3..4b6c013c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; uniform mat4 m; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; uniform mat4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test index 151fdaec..d858ca54 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test index f3ec0e38..8198236a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test index 27e81b6a..6b9c7888 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test index ba9a4169..af2551a7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test index acb5bf96..213cb989 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test index 67a20049..412417c3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; varying mat2 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test index 8b5babbe..9c302026 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test index caaedf68..d736018c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying mat2 m[3]; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying mat2 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test index 61e91b51..852e1b19 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat2 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test index b07a98cf..929a47e3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test index 8b65007f..595069d7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test index 77c0095c..ac3d15ab 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test index 161f596a..905eaf90 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test index 009cefa6..fabf1a56 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; varying mat3 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test index a99c306b..ee8b6d22 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test index 59993545..c60d5d4d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying mat3 m[3]; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying mat3 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test index 1b2e7336..dfda10e9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat3 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test index 68108a70..65febbab 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test index 8fdea06c..dae0367b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test index 43538dff..cbb486ce 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test index ce6c02fd..ab6060b5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test index c34fcb8a..6080b812 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; varying mat4 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test index e33607fb..14350290 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test index bb756ec8..2adf4aba 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying mat4 m[3]; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying mat4 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test index 7ddef700..b8261c48 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat4 m[3]; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test index 82bc5153..4e5db323 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test index fd21cdaa..86f05f15 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test index 8ae5105c..dc7f48d5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying mat2 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying mat2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test index 9a40c7c5..4b37fa01 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test index aa653faa..208ac1e8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test index 039d5695..7bc78f9e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test index 2197c42f..4967d6ca 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying mat3 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying mat3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test index 3a2e2611..3f3733bc 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test index 0e30c9e5..8883caec 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test index 8b06e27c..9085f16f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test index 51f3ab4f..6de6338a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying mat4 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying mat4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test index 274eea68..00c872a0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test index f7735225..f2ef2b97 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test index d4559105..6696fd34 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test index fa1a0318..aeede582 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test index 69e2b047..7f2ce85a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test index a3665320..7ee9bdac 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test index 0f75546e..dedcbdea 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test index 0367f2f8..427693fe 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test index a252af4e..449d3245 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test index 3859e428..36a79a25 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test index f23bec3d..1a6df3d0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test index cf3a1482..e12ff327 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test index bb0950d0..79376ab1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test index 899fb0f3..6c106dde 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test index d441b3a1..738ee806 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test index f314c93e..2ffe44a0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test index 2b68ad14..c479f2eb 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test index 680b7cbf..b99a9f4a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test index af57f358..d10168b8 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test index e74afe9c..986d54c9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test index a3a6400c..993f754c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test index fab9d0f5..ec32a063 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test index fd7441c3..71d30b0c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test index 0459de9a..73317b31 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test index a6fe5dae..9a917dad 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test index 796e546b..f2c91e5e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test index 8ffd5633..ce798073 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test index 16d0ec84..ab121dbe 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test index 9256112d..2e4206c6 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test index ae40544a..f5ad796c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test index 0d61714c..069e68b5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test index d5c044d2..7c3b650f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test index 028cdde1..30c7a54d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test index 9b46ded4..608edfe9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test index 61b0cc77..70985b6d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test index 749d64a3..c8d2908c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test index 46d4f538..cacfeca5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test index c61f9d64..6f4aba50 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test index 67f7544d..1ab8c668 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test index 8c9b1ceb..99f70a1e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test index 9187c38c..192b9510 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test index 3d4f9553..b9e2d87c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; uniform mat2 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test index bc5becb7..0b59f773 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test index 561dbe81..fe004293 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; uniform mat2 m[3]; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; uniform mat2 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test index 22f7002b..04684dae 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test index 3d6664e8..8fce20df 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test index b2bde47d..28fe4970 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test index b538777f..506b9d40 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test index b43405fe..0489e594 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test index 89e1c16b..3f6aacca 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; uniform mat3 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test index eba0c335..595f9c99 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test index ab4bcd74..6ec1c983 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; uniform mat3 m[3]; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; uniform mat3 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test index c0af950d..4bb8ac40 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test index b69b3441..afdaba1b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test index be2ddc88..7576be19 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test index 3feb36c9..f2100013 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test index fc481950..ab7f16da 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test index ed5d2e29..c78f738f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; uniform mat4 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test index 63638ffa..2341e881 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test index 6020714f..9989782e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; uniform mat4 m[3]; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; uniform mat4 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test index 17487b94..4bf92f36 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m[3]; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test index 36ece655..a9dd5c18 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; uniform mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test index 792b3433..5b24098f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test index 8ec2f571..3fd7a80f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; uniform mat2 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; uniform mat2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test index 9ecdcbcf..8c1ad98f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test index 60f11360..8954fd20 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; uniform mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test index 38a40294..ab3e3573 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test index 7c67df2d..ffb90840 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; uniform mat3 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; uniform mat3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test index 38acf8d9..de843da9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test index 99527462..cc9a6a7c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; uniform mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test index 4c0ca045..8581ec35 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test index f7ffde2c..33cad921 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; uniform mat4 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; uniform mat4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test index 2e091e4a..a5f35082 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; uniform mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test index 272ecae6..188f437d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test index e3740d26..f3ea08c1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test index f811b1c2..adaf9304 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test index bf3c7c70..18d5e150 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test index 06be962c..1943a822 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test index 36933ac8..0c963c7f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test index 189995a7..25400fa3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test index c18124f4..2e8e07af 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test index b0c2a2e3..6ae95e26 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec2 expect; varying mat2 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec2 expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test index 35f238b0..1eccd812 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test index 55adf239..920148ec 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test index 1be320e5..92a80843 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test index 9b89902f..3444392f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying mat2 m[3]; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying mat2 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test index 6b9eb70d..59771c3c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat2 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat2 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test index 3b9ad245..ef202b0f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test index 312db59a..c543a61f 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test index 98586265..d8f16c07 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test index 1b2ea278..b46a6b71 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test index 41d504ac..544a7294 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test index adb4e9fe..eec0614b 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test index 975c255f..348185dd 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test index 84eb92b1..3b681d41 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test index b277be94..7f0ef4f7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test index 22a970ad..7665967a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test index 6e19aa36..0d3841d0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec3 expect; varying mat3 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec3 expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test index 19a62d92..38608541 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test index 9c7441f0..be8f11e2 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test index 5b539732..99747c26 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test index 0c3673de..3ec6d40e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying mat3 m[3]; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying mat3 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test index fc4b3291..07a131a6 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat3 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat3 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test index 81ad559a..81fdac43 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test index 0e0d1bca..f156001c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test index 306fae1b..7fa1b6a5 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test index ceaee5d3..fdb2f317 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test index 425d4267..c74b56a0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test index 7792f823..98a69b55 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test index ac71a757..7febdad7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test index 03eb0596..11bf4fc6 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test index da56d002..bf1a8377 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test index 7c6d108d..d7296dc7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test index 2bf421b0..70d36d69 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform vec4 expect; varying mat4 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform vec4 expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test index cc4a5fed..a1501744 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 110 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test index 709c6a4a..7b9064c0 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test index 57b0708d..85d170a3 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test index 20df7b1f..806f6973 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying mat4 m[3]; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying mat4 m[3]; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test index ffd1aae4..74a0a39d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat4 m[3]; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat4 m[3]; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test index d7741787..c858011c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test @@ -37,7 +37,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test index 988f7157..53487ac1 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test @@ -36,7 +36,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test index b0fd3842..9b815555 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec2 expect; varying mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test index ac5f17e2..a58e119e 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test index 0f607195..e588165d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test index f1706ba0..2ba1a267 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test index b2988837..31fbc1f7 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec2 expect; varying mat2 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 110 uniform vec2 expect; varying mat2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test index a6d09b54..1552fc78 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat2 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat2 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test index 37791e74..2a209bb9 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-wr.shader_test index 66fad047..71f3f5a4 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test index 98470852..d7020a52 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec3 expect; varying mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test index 56576117..525b1646 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test index b70b3c2c..ac262360 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test index bc5e3e46..658a28ae 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test index 76424068..433d4d93 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec3 expect; varying mat3 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 110 uniform vec3 expect; varying mat3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test index 2d4e70f3..fdfff453 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat3 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat3 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test index 859d9f33..723578b4 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-wr.shader_test index 770fbdc8..0b1ad044 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test index 874f03c2..08529d1d 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform vec4 expect; varying mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test index 1a50570b..17080f87 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test index 97107f9a..e2f3d7fe 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test index edc999ee..4b8a3065 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test index 5b9f4840..8201566c 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform vec4 expect; varying mat4 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 110 uniform vec4 expect; varying mat4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test index da906c3d..b15ab100 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.10 [vertex shader] -#version 110 uniform int row; uniform float expect; varying mat4 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform int row; uniform float expect; varying mat4 m; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test index aeca2438..0c4083da 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-wr.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-wr.shader_test index 377bf894..0c1d478a 100644 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-wr.shader_test +++ b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 110 uniform mat4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.10/variable-index-read.sh b/tests/spec/glsl-1.10/variable-index-read.sh index 12b06858..80cb078d 100755 --- a/tests/spec/glsl-1.10/variable-index-read.sh +++ b/tests/spec/glsl-1.10/variable-index-read.sh @@ -164,7 +164,6 @@ function emit_vs fi echo "[vertex shader]" - echo "#version ${version/./}" emit_globals $* echo "void main()" @@ -218,7 +217,6 @@ emit_fs() do_compare=$7 echo "[fragment shader]" - echo "#version ${version/./}" emit_globals $* echo "void main()" diff --git a/tests/spec/glsl-1.10/variable-index-write.sh b/tests/spec/glsl-1.10/variable-index-write.sh index 449a7509..96a47918 100755 --- a/tests/spec/glsl-1.10/variable-index-write.sh +++ b/tests/spec/glsl-1.10/variable-index-write.sh @@ -177,7 +177,6 @@ function emit_fs fi echo "[fragment shader]" - echo "#version ${version/./}" emit_globals $* @@ -330,7 +329,6 @@ function emit_fs_wr_test echo echo "[vertex shader]" - echo "#version ${version/./}" echo "void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; }" echo @@ -353,7 +351,6 @@ function emit_vs_wr_test echo echo "[vertex shader]" - echo "#version ${version/./}" emit_globals $* echo "void main()" @@ -374,7 +371,6 @@ function emit_vs_wr_test if [ "x$mode" != "xvarying" ];then echo "[fragment shader]" - echo "#version ${version/./}" echo "void main() { gl_FragColor = gl_Color; }" echo else diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test index 9c4a56ee..0f39fad9 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test index d4bcb1a2..279a8fde 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test index 43edb932..90aba4e8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test index 4c8014f3..bd605c7a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test index 2b8fe0c9..bbe315cd 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test index cd66f7d9..6195594f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test index 30da6b36..1ceaab4a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test index edc20f53..0fdac68d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test index 41addaa1..fd9fe909 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test index 62c17965..c72fe661 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test index 62c891b9..bfdc159b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test index fd1a60ca..78732f09 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test index 7a59c495..aa1b3d9f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test index dd79c6e8..cd244ebf 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test index 42b00917..88d65497 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test index 63a2453e..5f8f9aa3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test index 22bcf3e0..382cd688 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test index a46f1bc0..d33a6f8d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test index 34e64811..92263d2d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test index c3e26507..0d13ffb5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test index fa87d92e..0fe205ca 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test index dd072f30..8829d3f8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test index 7242afb9..e317d3d6 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test index 5d87de72..bc522bd5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test index f555b0b7..41881cd1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test index 04e63127..f4f1aa31 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test index 01719e2e..e36217b8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test index c8a11d5f..11c37604 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test index b991bbc9..f5d43799 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test index ab842f76..e7ca492a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test index 49ee3f66..e0ac971b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test index e5dbae78..997ec432 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test index 542edcbd..950ef190 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test index 0785f198..c8cda8b4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test index 9c4c279c..f5e21372 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test index eeb4d8cd..2a7ae831 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test index 193fce4e..3c812670 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test index 4499d529..f380dd88 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test index c4e3007d..2c6200aa 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test index 79ac9f1f..ddf2d24d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test index 1174ac96..288204d7 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test index 081be553..f7af13db 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test index 4c307aa2..fbb95a9d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test index 53e989e4..db0f8e73 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test index d7250961..7ac10449 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test index f4645d9b..c688a8c5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test index 64aafa7f..565322be 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test index 37fdb3c3..7787aa0a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test index 69b747db..2e135e8d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test index 4fc9ffe0..e5b35008 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test index 3c325c9d..4194db5a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test index 8f76813d..30ff249d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test index d7c2cb65..94d0b55b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test index 760c2e0a..c891d61c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test index 19e45cbc..d03e65e0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-wr.shader_test index c8c8cba6..727ec221 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test index 0deb2e91..352b9836 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test index 579d6b20..fb1f0286 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test index 1ce20536..a6d59826 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test index ac3aa671..172f9024 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test index 1f3ab080..fb89c7a4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test index 83bc89b0..d205c331 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test index b0933cbb..28d5c129 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-wr.shader_test index e3feddb6..9f138882 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test index 6b0915bc..ca511812 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test index ec057e7f..934150a2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test index 457b6218..686e838c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test index b4dc82a6..2214fa5f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test index 79a341df..69a2ea57 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying vec4 color; @@ -15,7 +14,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test index 1df61e8f..78281585 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test index 6e996521..3c68de10 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-wr.shader_test index 7daa4be8..11cb707f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-wr.shader_test @@ -2,14 +2,12 @@ # ../../../glsl-1.10/variable-index-write.sh 1.20 [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; 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 6d7fb4a6..943b312c 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( 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 25d32df6..06468cdd 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 30903cdf..8f11e54b 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; 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 ee39fcac..96d8b46e 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 5dc8000b..d84e4b4a 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( 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 0a4d22e3..c8ea690b 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 5e27571b..a0e6b3d2 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( mat2x2(1.0, 2.0, 3.0, 4.0), @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( mat2x2(1.0, 2.0, 3.0, 4.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 4f68406f..ea334661 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2[3] m = mat2x2[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2[3] m = mat2x2[3]( 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 edecc0cb..ac46c726 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( 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 1a47ced4..3b98b00d 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 1b66769e..abe4252c 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; 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 3f6e1621..7b22586f 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 f09ee1e2..4cd2d26d 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( 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 537d1fd7..a7e27657 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 bbb802cc..eff12569 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), 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 fe49c0f0..b231faa2 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3[3] m = mat3x3[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3[3] m = mat3x3[3]( 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 fe067400..2039e258 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( 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 65cadd93..2aa60f12 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 4a98a0d2..e95785ac 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; 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 9ec60bd2..09eba56c 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 e28a2b6f..6716a5fd 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( 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 192d841a..a83df7c1 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 cc0ba10d..c3eb3735 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), 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 cc9dbb72..c41545bf 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4[3] m = mat4x4[3]( @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4[3] m = mat4x4[3]( diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test index ed83ad37..f02f3ec3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test index 93de8f0a..79051eed 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test index dfeda235..2924935f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test index 967f81a8..8912c48f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test index 4f23cf70..f8141b82 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test index 13ce6a54..cc1418e5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test index 00844124..93cc20ac 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test index a6c58198..8eecf988 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test index 0c12a44c..b3b98f95 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test index 9cb1545b..7434c0a3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test index 46e8d764..e8fcbd16 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); varying vec4 color; @@ -16,7 +15,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test index 5a08d04b..2d63b8f3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); @@ -17,7 +16,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test index f5d53243..dc1ee89d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test index 4651de85..a6b8ae6b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test index b20af67c..9f5b0f00 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test index b7ba2fe6..a1a43070 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test index e9560b76..8f7e819e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; varying mat2x2[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test index 10135d07..11649370 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test index b78c330e..9b0579f8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying mat2x2[3] m; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying mat2x2[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test index ccfb4908..145889ed 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat2x2[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test index b59cd719..679f9af2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test index 8366fb0c..33afe843 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test index 894510df..ef1f10a6 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test index 8296e0be..77a96e27 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test index 9fc2c68e..88fe5ce1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; varying mat3x3[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test index 8d7ea4ce..4aa49af1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test index 6869bd3f..2d47123e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying mat3x3[3] m; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying mat3x3[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test index daa3d4f4..c73255bb 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat3x3[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test index 51c0b2fe..8ecda152 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test index bb57ff89..687cf6ee 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test index e35ec59a..edec6167 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test index 4bf4559b..ae9d5877 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test index 985e285e..7714242b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; varying mat4x4[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test index 2592a751..5045dc32 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test index a68cdcd5..cd8ae33b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying mat4x4[3] m; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying mat4x4[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test index faf4f23d..42b43444 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat4x4[3] m; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test index 71b0891d..88ff4596 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test index 417889ff..15324f0a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test index 09893b59..eb6fbeef 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying mat2x2 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying mat2x2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test index 54ed6cb7..3cb90460 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat2x2 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat2x2 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test index 6e0c0c51..b565eaeb 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test index 8f1982cd..0bfcf3ed 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test index bba23e4a..f7c71bca 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying mat3x3 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying mat3x3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test index de3a6971..4cccf436 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat3x3 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat3x3 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test index 4097e5c7..09f96149 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test index 42892575..5ad24a2b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test index 34416786..57fcf005 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying mat4x4 m; varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying mat4x4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test index 96cd3e7e..319f2b9c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat4x4 m; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat4x4 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test index cddaaba9..98aa6f84 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test index aa22a7bb..953d59f1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test index 525abcdf..9d02ac43 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test index 8c11d49b..8cef49c6 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test index 596a183d..d8819f33 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test index 87fc6442..353a5394 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test index b100a1b1..de95b745 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test index 1784bf02..16b96dd4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test index 624bbaea..97009cd6 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test index c5359cb3..4a40ee41 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test index 40271f11..95267942 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test index 9089a27c..dee34fc1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test index cb6548d7..63380f9c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test index e2967055..5aa096c3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test index 962bcf6d..a7af0383 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test index d87309cf..5a198a98 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test index 3df024dc..2f5eb1b0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test index 45877bdc..724fca20 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test index df5b1686..60a8813e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test index 814b426f..1185a207 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -25,7 +24,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test index 74056dc9..4b93c4d0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test index 9107641d..40a1c216 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test index f62c417b..502d5dc5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying vec4 color; @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test index 5769b086..07038ef7 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test index cc5c9ed9..78238f2d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test index 96659d9e..c5008fff 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test index 08eb0c25..45a4a87c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test index 8ccda997..6d3a2eee 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test index c61fb9fb..032a523f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test index 2aecfedf..d7c38227 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test index 671abc18..3fceb28c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test index 32a9ccbf..d296911e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test index 2ba1ee93..cfe9858b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test index 3b6a6abe..77053738 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test index bc51c91a..3859cff3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying vec4 color; @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test index ce8699a1..3cbca9d4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying vec4 color; 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 6099ee0b..5179b221 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( 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 c4001f5d..15fa69b6 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 f2e0cb4a..40444816 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; 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 0f64c166..7b648229 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 d3639fa9..64c0c6f3 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( 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 4b06878d..5f26e078 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 692acf38..36abf245 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( mat2x2(1.0, 2.0, 3.0, 4.0), @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; uniform mat2x2[3] m = mat2x2[3]( mat2x2(1.0, 2.0, 3.0, 4.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 4df990f5..ba3fb32d 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2[3] m = mat2x2[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2[3] m = mat2x2[3]( 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 221fae76..d579506d 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( 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 7ddbbf26..f85987fc 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 a8d264b3..612ad20f 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; 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 0b2f2de2..9a768b85 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 6bc5b673..02b01668 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( 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 0afb56d1..ddd8dafe 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 fa7de5f6..bdba71f5 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; uniform mat3x3[3] m = mat3x3[3]( mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), 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 307a0f80..468875a2 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3[3] m = mat3x3[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3[3] m = mat3x3[3]( 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 d04821b4..34107fe5 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( 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 b7e160ad..9979e064 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; 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 1b98eede..f83c38a6 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; 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 0cb1bb5f..830c3f5b 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -24,7 +23,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; 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 0a70d152..13d1cbfb 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( 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 c5df2339..73689b15 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -23,7 +22,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; 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 04c01345..ccdec23a 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), @@ -21,7 +20,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; uniform mat4x4[3] m = mat4x4[3]( mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), 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 9b5ae5cf..0b0cbf3d 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 @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4[3] m = mat4x4[3]( @@ -22,7 +21,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4[3] m = mat4x4[3]( diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test index 4234fbd0..2aae5551 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test index 9270e327..bca0fe95 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test index d092be5f..57643287 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test index 46bdcbf9..30bd0870 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test index 0ce8e5d9..de94a1db 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test index e986951a..123dbf25 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test index 342a7a9d..7c65df34 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test index d55dcf8f..287b0a87 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test index 2464b11a..5961db59 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test index b6ed60cb..43d536f9 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -20,7 +19,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test index 45ab2425..9a06d65b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); varying vec4 color; @@ -18,7 +17,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test index 0389be0a..5eaa3355 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); @@ -19,7 +18,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test index 6fac4766..e8638b29 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test index a83d6a7e..55992b73 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test index 238301aa..193bc538 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test index 9f8af3fc..18a92be3 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test index 9cedc8df..01748a31 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test index 43e1c76a..fc2f094d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test index f80a2f14..dd1d64df 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test index 760334c0..551969e2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test index b18868bb..1df7d491 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec2 expect; varying mat2x2[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec2 expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test index 5be4011a..2b2daf10 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test index b5672aa1..ad455266 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test index a11fdadc..c473cce5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test index 88f176ba..cee403c2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying mat2x2[3] m; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying mat2x2[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test index bfe2aee5..3f6d98e2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat2x2[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat2x2[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test index 0960afb7..bb24ad83 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test index 7f78d727..a677c652 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test index 2fa65dac..cff035aa 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test index d77dc3fd..9d08ba2c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test index 368072e2..2bfca6c1 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test index 662cc059..773a3b60 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test index 167f58e1..b78a8d47 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test index a8a22dd1..4e68e1c0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test index 93d6daac..f69edbc2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test index 6d0f0179..946e200f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test index 6f5dc617..9d683e73 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec3 expect; varying mat3x3[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec3 expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test index e6966c0d..c6126c9c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test index a2bfd3b3..5ab56c2b 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test index 8053a3f1..34ef6730 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test index 267fdf19..10f9dd58 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying mat3x3[3] m; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying mat3x3[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test index cb0bbcd5..b5b9102d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat3x3[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat3x3[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test index e03fb02f..f933a470 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test index 2533b078..9bb92993 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test index 98c94336..6d8962be 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test index a7da889f..3d0c5e1a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test index a66680fc..a44de2a4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test index 97bc778f..4cf80524 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test index 2ce2f4c8..33274db2 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test index e5e30e7c..3ac7574d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int col; uniform int row; @@ -33,7 +32,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int col; uniform int row; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test index 886b8d19..9b7846a0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test index aed292a7..e1d54a54 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test index 981c49e9..c815b729 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform vec4 expect; varying mat4x4[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform vec4 expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test index 5b04facc..174787b9 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int index; uniform int row; uniform float expect; @@ -32,7 +31,6 @@ void main() } [fragment shader] -#version 120 uniform int index; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test index e55473f4..05dce43d 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test index 488ff4ba..a014afb8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test index 3e64a2ed..eb7e5cc4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying mat4x4[3] m; varying vec4 color; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying mat4x4[3] m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test index 341630bc..b581d63e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat4x4[3] m; @@ -31,7 +30,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat4x4[3] m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test index 13d1b0bb..ae3a2f24 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-wr.shader_test @@ -35,7 +35,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test index 7481a6e4..4d437a4c 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-wr.shader_test @@ -34,7 +34,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test index fc6d02a3..23e6fde8 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec2 expect; varying mat2x2 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test index 9c77ad54..879efb7a 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test index f72dd3cb..6f47dc30 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test index 67715e01..8ab25a38 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test index ee930f3f..539ca059 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec2 expect; varying mat2x2 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 120 uniform vec2 expect; varying mat2x2 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test index 2d55e77a..9b9f54ad 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat2x2 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat2x2 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test index e1b744c9..44a7b3b4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-wr.shader_test index 1cf54d62..7b331f0f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat2x2 src_matrix; uniform vec2 v; uniform vec2 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test index 8897263b..3f3db3d0 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec3 expect; varying mat3x3 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test index 253c24f5..a518f128 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test index d990c377..1a173b59 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test index a1fff20e..404fa2f7 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test index c17ccb45..c54928f5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec3 expect; varying mat3x3 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 120 uniform vec3 expect; varying mat3x3 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test index ed368372..21b6d448 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat3x3 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat3x3 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test index 780f0d26..132c32fe 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-wr.shader_test index c1e99542..3cfd3b84 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat3x3 src_matrix; uniform vec3 v; uniform vec3 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test index cf16651a..b0f67b7e 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform vec4 expect; varying mat4x4 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test index 204db703..898d8e38 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int col; uniform int row; uniform float expect; @@ -30,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform int col; uniform int row; uniform float expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test index ad72cc24..667bec47 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test index 8be146b3..91791c19 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test index d34d9410..3e7a147f 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform vec4 expect; varying mat4x4 m; varying vec4 color; @@ -28,7 +27,6 @@ void main() } [fragment shader] -#version 120 uniform vec4 expect; varying mat4x4 m; varying vec4 color; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test index a1563f6a..5f3a88d5 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test @@ -5,7 +5,6 @@ GLSL >= 1.20 [vertex shader] -#version 120 uniform int row; uniform float expect; varying mat4x4 m; @@ -29,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform int row; uniform float expect; varying mat4x4 m; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test index e78e4192..a05da7c4 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-wr.shader_test @@ -29,7 +29,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-wr.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-wr.shader_test index 5de207f3..4ebd2eeb 100644 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-wr.shader_test +++ b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-wr.shader_test @@ -28,7 +28,6 @@ void main() } [fragment shader] -#version 120 uniform mat4x4 src_matrix; uniform vec4 v; uniform vec4 expect; |