[Piglit] [PATCH 1/3] Fix mismatched GLSL versions in some shader_test files.

[Stuart Abercrombie]

Replace inconsistent GLSL >= / #version with GLSL >= only.
The #version directive will be inserted by shader_runner.

Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
---
 tests/shaders/glsl-array-compare-02.shader_test    |    4 +---
 tests/shaders/glsl-array-compare.shader_test       |    5 +----
 tests/shaders/glsl-complex-subscript.shader_test   |    4 +---
 tests/shaders/glsl-invariant-pragma.shader_test    |    4 +---
 ...l-uniform-non-uniform-array-compare.shader_test |    5 +----
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/tests/shaders/glsl-array-compare-02.shader_test b/tests/shaders/glsl-array-compare-02.shader_test
index a570042..3ba00c2 100644
--- a/tests/shaders/glsl-array-compare-02.shader_test
+++ b/tests/shaders/glsl-array-compare-02.shader_test
@@ -1,8 +1,7 @@
 [require]
-GLSL >= 1.10
+GLSL >= 1.20
 
 [vertex shader]
-#version 120
 /* Verify that two arrays can be directly compared correctly.
  */
 void main()
@@ -11,7 +10,6 @@ void main()
 }
 
 [fragment shader]
-#version 120
 
 void main()
 {
diff --git a/tests/shaders/glsl-array-compare.shader_test b/tests/shaders/glsl-array-compare.shader_test
index 17b1950..bd31f65 100644
--- a/tests/shaders/glsl-array-compare.shader_test
+++ b/tests/shaders/glsl-array-compare.shader_test
@@ -1,8 +1,7 @@
 [require]
-GLSL >= 1.10
+GLSL >= 1.20
 
 [vertex shader]
-#version 120
 /* Verify that two arrays can be directly compared correctly.
  */
 void main()
@@ -11,8 +10,6 @@ void main()
 }
 
 [fragment shader]
-#version 120
-
 void main()
 {
 	float ff[2] = float[2](3.3, 3.5);
diff --git a/tests/shaders/glsl-complex-subscript.shader_test b/tests/shaders/glsl-complex-subscript.shader_test
index 99e294d..1bd9079 100644
--- a/tests/shaders/glsl-complex-subscript.shader_test
+++ b/tests/shaders/glsl-complex-subscript.shader_test
@@ -1,10 +1,8 @@
 [require]
 GL >= 2.0
-GLSL >= 1.10
+GLSL >= 1.20
 
 [fragment shader]
-#version 120
-
 void main()
 {
 	mat2 a;
diff --git a/tests/shaders/glsl-invariant-pragma.shader_test b/tests/shaders/glsl-invariant-pragma.shader_test
index 399adbd..e91545e 100644
--- a/tests/shaders/glsl-invariant-pragma.shader_test
+++ b/tests/shaders/glsl-invariant-pragma.shader_test
@@ -1,8 +1,7 @@
 [require]
-GLSL >= 1.10
+GLSL >= 1.20
 
 [vertex shader]
-#version 120
 #pragma STDGL invariant(all)
 varying float var;
 void main()
@@ -12,7 +11,6 @@ void main()
 }
 
 [fragment shader]
-#version 120
 invariant varying float var;
 void main()
 {
diff --git a/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test b/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test
index d459953..a690817 100644
--- a/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test
+++ b/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test
@@ -1,8 +1,7 @@
 [require]
-GLSL >= 1.10
+GLSL >= 1.20
 
 [vertex shader]
-#version 120
 /* Verify that the uniform array can compare with non-uniform array correctly.
  */
 void main()
@@ -11,8 +10,6 @@ void main()
 }
 
 [fragment shader]
-#version 120
-
 uniform float ff[2] = float[2](3.3, 3.5);
 void main()
 {
-- 
1.7.5.4