glsl2 tests: remove #version tags.

75 files changed, 72 insertions, 99 deletions

diff --git a/tests/glslparsertest/glsl2/attribute-10.vert b/tests/glslparsertest/glsl2/attribute-10.vert
index 487aeff3..87adae96 100644
--- a/tests/glslparsertest/glsl2/attribute-10.vert
+++ b/tests/glslparsertest/glsl2/attribute-10.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* FAIL - attribute cannot have array type in GLSL 1.20 */
 attribute vec4 i[10];
 
diff --git a/tests/glslparsertest/glsl2/bit-not-02.frag b/tests/glslparsertest/glsl2/bit-not-02.frag
index 523b5f74..c13de892 100644
--- a/tests/glslparsertest/glsl2/bit-not-02.frag
+++ b/tests/glslparsertest/glsl2/bit-not-02.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - bitwise operations aren't supported in 1.20. */
-#version 120
+
 void main()
 {
     int x = ~0 - 1;
diff --git a/tests/glslparsertest/glsl2/bit-not-09.frag b/tests/glslparsertest/glsl2/bit-not-09.frag
index 4f3a6489..9609e537 100644
--- a/tests/glslparsertest/glsl2/bit-not-09.frag
+++ b/tests/glslparsertest/glsl2/bit-not-09.frag
@@ -4,7 +4,7 @@
 // [end config]
 
 /* FAIL - bitwise operations aren't supported in 1.20. */
-#version 120
+
 void main()
 {
     int x = ~false;
diff --git a/tests/glslparsertest/glsl2/builtin-functions-110.frag b/tests/glslparsertest/glsl2/builtin-functions-110.frag
index b16d0aa6..66e6971d 100644
--- a/tests/glslparsertest/glsl2/builtin-functions-110.frag
+++ b/tests/glslparsertest/glsl2/builtin-functions-110.frag
@@ -1,12 +1,3 @@
-// [config]
-// expect_result: pass
-// glsl_version: 1.10
-//
-// # NOTE: Config section was auto-generated from file
-// # NOTE: 'glslparser.tests' at git revision
-// # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
-// [end config]
-
 /* PASS */
 #version 110
 
diff --git a/tests/glslparsertest/glsl2/builtin-functions-110.vert b/tests/glslparsertest/glsl2/builtin-functions-110.vert
index 4a3e12e9..08e192c7 100644
--- a/tests/glslparsertest/glsl2/builtin-functions-110.vert
+++ b/tests/glslparsertest/glsl2/builtin-functions-110.vert
@@ -1,12 +1,3 @@
-// [config]
-// expect_result: pass
-// glsl_version: 1.10
-//
-// # NOTE: Config section was auto-generated from file
-// # NOTE: 'glslparser.tests' at git revision
-// # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
-// [end config]
-
 /* PASS */
 #version 110
 
diff --git a/tests/glslparsertest/glsl2/builtin-functions-120.vert b/tests/glslparsertest/glsl2/builtin-functions-120.vert
index 05453f1c..bfe2f455 100644
--- a/tests/glslparsertest/glsl2/builtin-functions-120.vert
+++ b/tests/glslparsertest/glsl2/builtin-functions-120.vert
@@ -1,12 +1,3 @@
-// [config]
-// expect_result: pass
-// glsl_version: 1.20
-//
-// # NOTE: Config section was auto-generated from file
-// # NOTE: 'glslparser.tests' at git revision
-// # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
-// [end config]
-
 /* PASS */
 #version 120
 
diff --git a/tests/glslparsertest/glsl2/condition-05.vert b/tests/glslparsertest/glsl2/condition-05.vert
index 1b429373..3c45194e 100644
--- a/tests/glslparsertest/glsl2/condition-05.vert
+++ b/tests/glslparsertest/glsl2/condition-05.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* PASS */
 
 uniform bool a;
diff --git a/tests/glslparsertest/glsl2/condition-07.vert b/tests/glslparsertest/glsl2/condition-07.vert
index 3c58e8f2..816c44ef 100644
--- a/tests/glslparsertest/glsl2/condition-07.vert
+++ b/tests/glslparsertest/glsl2/condition-07.vert
@@ -16,7 +16,7 @@
  *    that can be applied to one of the expressions to make their types
  *    match."
  */
-#version 120
+
 
 uniform bool selector;
 uniform vec4 a[2];
diff --git a/tests/glslparsertest/glsl2/const-array-01.frag b/tests/glslparsertest/glsl2/const-array-01.frag
index 98cfb1cc..f1fb3d39 100644
--- a/tests/glslparsertest/glsl2/const-array-01.frag
+++ b/tests/glslparsertest/glsl2/const-array-01.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 void main()
 {
   const float a[] = float[](0.0, 1.0, 0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/const-array-02.frag b/tests/glslparsertest/glsl2/const-array-02.frag
index 30319c9c..e4572e73 100644
--- a/tests/glslparsertest/glsl2/const-array-02.frag
+++ b/tests/glslparsertest/glsl2/const-array-02.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 void main()
 {
   const float a[] = float[](0.0, 1.0, 0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/const-array-03.frag b/tests/glslparsertest/glsl2/const-array-03.frag
index f2eda8a9..ce256cbf 100644
--- a/tests/glslparsertest/glsl2/const-array-03.frag
+++ b/tests/glslparsertest/glsl2/const-array-03.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 void main()
 {
    const float a[] = float[](0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/const-array-04.frag b/tests/glslparsertest/glsl2/const-array-04.frag
index 26f26a0f..d951b81f 100644
--- a/tests/glslparsertest/glsl2/const-array-04.frag
+++ b/tests/glslparsertest/glsl2/const-array-04.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 void main()
 {
    const float a[] = float[](0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/const-array-05.frag b/tests/glslparsertest/glsl2/const-array-05.frag
index 675a33d9..fbe5a867 100644
--- a/tests/glslparsertest/glsl2/const-array-05.frag
+++ b/tests/glslparsertest/glsl2/const-array-05.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 void main()
 {
    const float a[2] = float[2](0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/const-builtin-110.frag b/tests/glslparsertest/glsl2/const-builtin-110.frag
index 53e21cd9..703d932f 100644
--- a/tests/glslparsertest/glsl2/const-builtin-110.frag
+++ b/tests/glslparsertest/glsl2/const-builtin-110.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - calls to builtins are not legal in 1.10 */
-#version 110
+
 void main() {
    const float one = abs(-1.0);
 }
diff --git a/tests/glslparsertest/glsl2/const-builtin-noise1.frag b/tests/glslparsertest/glsl2/const-builtin-noise1.frag
index 1fc9281f..ddd8f58f 100644
--- a/tests/glslparsertest/glsl2/const-builtin-noise1.frag
+++ b/tests/glslparsertest/glsl2/const-builtin-noise1.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - noise functions are not allowed in constant expressions */
-#version 120
+
 void main() {
    const float noise = noise1(0.5);
 }
diff --git a/tests/glslparsertest/glsl2/const-builtin-noise2.frag b/tests/glslparsertest/glsl2/const-builtin-noise2.frag
index 56442f2b..a2b5912e 100644
--- a/tests/glslparsertest/glsl2/const-builtin-noise2.frag
+++ b/tests/glslparsertest/glsl2/const-builtin-noise2.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - noise functions are not allowed in constant expressions */
-#version 120
+
 void main() {
    const vec2 noise = noise2(0.5);
 }
diff --git a/tests/glslparsertest/glsl2/const-builtin-noise3.frag b/tests/glslparsertest/glsl2/const-builtin-noise3.frag
index 5a45e0a5..e04e70d2 100644
--- a/tests/glslparsertest/glsl2/const-builtin-noise3.frag
+++ b/tests/glslparsertest/glsl2/const-builtin-noise3.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - noise functions are not allowed in constant expressions */
-#version 120
+
 void main() {
    const vec3 noise = noise3(0.5);
 }
diff --git a/tests/glslparsertest/glsl2/const-builtin-noise4.frag b/tests/glslparsertest/glsl2/const-builtin-noise4.frag
index 960547e5..5eceb51e 100644
--- a/tests/glslparsertest/glsl2/const-builtin-noise4.frag
+++ b/tests/glslparsertest/glsl2/const-builtin-noise4.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - noise functions are not allowed in constant expressions */
-#version 120
+
 void main() {
    const vec4 noise = noise4(0.5);
 }
diff --git a/tests/glslparsertest/glsl2/const-implicit-conversion.frag b/tests/glslparsertest/glsl2/const-implicit-conversion.frag
index 04118119..cda3b4a6 100644
--- a/tests/glslparsertest/glsl2/const-implicit-conversion.frag
+++ b/tests/glslparsertest/glsl2/const-implicit-conversion.frag
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const float length = 5;
diff --git a/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag b/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag
index 71bc1e09..b767598b 100644
--- a/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag
+++ b/tests/glslparsertest/glsl2/const-matrix-multiply-02.frag
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const mat3x2 c1 = mat3x2(1.0, 2.0, 3.0, 4.0, 5.0, 6.0);
diff --git a/tests/glslparsertest/glsl2/const-userfunction.frag b/tests/glslparsertest/glsl2/const-userfunction.frag
index 6c3bcc2b..7f387c4c 100644
--- a/tests/glslparsertest/glsl2/const-userfunction.frag
+++ b/tests/glslparsertest/glsl2/const-userfunction.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - user functions are not allowed in constant expressions */
-#version 120
+
 float id(float x) {
    return x;
 }
diff --git a/tests/glslparsertest/glsl2/const-vec-scalar-05.frag b/tests/glslparsertest/glsl2/const-vec-scalar-05.frag
index c92e76ee..c3f9e7be 100644
--- a/tests/glslparsertest/glsl2/const-vec-scalar-05.frag
+++ b/tests/glslparsertest/glsl2/const-vec-scalar-05.frag
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const vec4 t1 = vec4(-1.0, 0.0, -1.0, -1.0);
diff --git a/tests/glslparsertest/glsl2/constructor-04.vert b/tests/glslparsertest/glsl2/constructor-04.vert
index 3d3daa47..c4b85b82 100644
--- a/tests/glslparsertest/glsl2/constructor-04.vert
+++ b/tests/glslparsertest/glsl2/constructor-04.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* FAIL - matrix must be only parameter to matrix constructor */
 
 uniform mat2 a;
diff --git a/tests/glslparsertest/glsl2/constructor-06.vert b/tests/glslparsertest/glsl2/constructor-06.vert
index 37283fc0..52a92597 100644
--- a/tests/glslparsertest/glsl2/constructor-06.vert
+++ b/tests/glslparsertest/glsl2/constructor-06.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* PASS */
 
 uniform mat2 a;
diff --git a/tests/glslparsertest/glsl2/constructor-13.vert b/tests/glslparsertest/glsl2/constructor-13.vert
index c97a1ee9..f7c1d5fe 100644
--- a/tests/glslparsertest/glsl2/constructor-13.vert
+++ b/tests/glslparsertest/glsl2/constructor-13.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const mat3x2 m = mat3x2(ivec3(1,2,3),ivec3(4,5,6));
diff --git a/tests/glslparsertest/glsl2/constructor-16.vert b/tests/glslparsertest/glsl2/constructor-16.vert
index 72ea4ae9..b7a49f91 100644
--- a/tests/glslparsertest/glsl2/constructor-16.vert
+++ b/tests/glslparsertest/glsl2/constructor-16.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 uniform vec2 u1;
 
 void main()
diff --git a/tests/glslparsertest/glsl2/constructor-18.vert b/tests/glslparsertest/glsl2/constructor-18.vert
index 7d92626a..fe1ee1d1 100644
--- a/tests/glslparsertest/glsl2/constructor-18.vert
+++ b/tests/glslparsertest/glsl2/constructor-18.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/constructor-19.vert b/tests/glslparsertest/glsl2/constructor-19.vert
index 033edd35..253e0e18 100644
--- a/tests/glslparsertest/glsl2/constructor-19.vert
+++ b/tests/glslparsertest/glsl2/constructor-19.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/constructor-20.vert b/tests/glslparsertest/glsl2/constructor-20.vert
index 39092ce8..e9740617 100644
--- a/tests/glslparsertest/glsl2/constructor-20.vert
+++ b/tests/glslparsertest/glsl2/constructor-20.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/constructor-21.vert b/tests/glslparsertest/glsl2/constructor-21.vert
index 1cc9002e..5e6efbdb 100644
--- a/tests/glslparsertest/glsl2/constructor-21.vert
+++ b/tests/glslparsertest/glsl2/constructor-21.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const mat2 m2 = mat2(2.00, 2.01, 2.10, 2.11);
diff --git a/tests/glslparsertest/glsl2/constructor-22.vert b/tests/glslparsertest/glsl2/constructor-22.vert
index 329a85ad..b13ac737 100644
--- a/tests/glslparsertest/glsl2/constructor-22.vert
+++ b/tests/glslparsertest/glsl2/constructor-22.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 void main()
 {
    const mat3 m3 = mat3(3.00, 3.01, 3.02, 3.10, 3.11, 3.12, 3.20, 3.21, 3.22);
diff --git a/tests/glslparsertest/glsl2/constructor-23.vert b/tests/glslparsertest/glsl2/constructor-23.vert
index fd2b9d49..e7c6a09d 100644
--- a/tests/glslparsertest/glsl2/constructor-23.vert
+++ b/tests/glslparsertest/glsl2/constructor-23.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 uniform mat2 m2;
 varying mat4 m4;
 void main()
diff --git a/tests/glslparsertest/glsl2/constructor-24.vert b/tests/glslparsertest/glsl2/constructor-24.vert
index 8ae7d47a..e2cf56c6 100644
--- a/tests/glslparsertest/glsl2/constructor-24.vert
+++ b/tests/glslparsertest/glsl2/constructor-24.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 uniform mat3 m3;
 varying mat2 m2;
 void main()
diff --git a/tests/glslparsertest/glsl2/constructor-26.vert b/tests/glslparsertest/glsl2/constructor-26.vert
index fb3fad7e..c544e430 100644
--- a/tests/glslparsertest/glsl2/constructor-26.vert
+++ b/tests/glslparsertest/glsl2/constructor-26.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 struct s { float f; };
 
 void main()
diff --git a/tests/glslparsertest/glsl2/draw_buffers-01.frag b/tests/glslparsertest/glsl2/draw_buffers-01.frag
index 562fcc2c..4353638d 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-01.frag
+++ b/tests/glslparsertest/glsl2/draw_buffers-01.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 110
+
 #extension GL_ARB_draw_buffers: disable
 
 uniform vec4 a;
diff --git a/tests/glslparsertest/glsl2/draw_buffers-05.vert b/tests/glslparsertest/glsl2/draw_buffers-05.vert
index 5c61a11a..01b8567b 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-05.vert
+++ b/tests/glslparsertest/glsl2/draw_buffers-05.vert
@@ -10,7 +10,7 @@
 /* PASS - GL_ARB_draw_buffers does exist in the vertex shader, but it only
  * makes the built in variable gl_MaxDrawBuffers be available.
  */
-#version 110
+
 
 /* This causes an error on some implementations, but is acceptable on others.
  * The GL_ARB_draw_buffers spec only specifies behavior when #extension is
diff --git a/tests/glslparsertest/glsl2/draw_buffers-06.vert b/tests/glslparsertest/glsl2/draw_buffers-06.vert
index ad4b0860..ea934ae3 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-06.vert
+++ b/tests/glslparsertest/glsl2/draw_buffers-06.vert
@@ -10,7 +10,7 @@
 /* PASS - GL_ARB_draw_buffers does exist in the vertex shader, but it only
  * makes the built in variable gl_MaxDrawBuffers be available.
  */
-#version 110
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/draw_buffers-07.vert b/tests/glslparsertest/glsl2/draw_buffers-07.vert
index 66d75cb5..ec81a8e3 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-07.vert
+++ b/tests/glslparsertest/glsl2/draw_buffers-07.vert
@@ -10,7 +10,7 @@
 /* FAIL - gl_MaxDrawBuffers is available, but gl_FragData is only in fragment
  * shaders
  */
-#version 110
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/draw_buffers-08.frag b/tests/glslparsertest/glsl2/draw_buffers-08.frag
index 50a2bff5..c660b6e8 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-08.frag
+++ b/tests/glslparsertest/glsl2/draw_buffers-08.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 110
+
 
 uniform vec4 a;
 
diff --git a/tests/glslparsertest/glsl2/draw_buffers-09.frag b/tests/glslparsertest/glsl2/draw_buffers-09.frag
index e0484195..fd81377d 100644
--- a/tests/glslparsertest/glsl2/draw_buffers-09.frag
+++ b/tests/glslparsertest/glsl2/draw_buffers-09.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - out of bounds access of gl_FragData */
-#version 110
+
 
 uniform vec4 a;
 
diff --git a/tests/glslparsertest/glsl2/gst-gl-convolution.frag b/tests/glslparsertest/glsl2/gst-gl-convolution.frag
index e21ea7af..13c84fb2 100644
--- a/tests/glslparsertest/glsl2/gst-gl-convolution.frag
+++ b/tests/glslparsertest/glsl2/gst-gl-convolution.frag
@@ -27,7 +27,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#version 120
+
 /* The #version was added by anholt in converting to piglit due to the
  * use of the array constructor.
  */
diff --git a/tests/glslparsertest/glsl2/gst-gl-hconv9.frag b/tests/glslparsertest/glsl2/gst-gl-hconv9.frag
index 01afa313..796bbccb 100644
--- a/tests/glslparsertest/glsl2/gst-gl-hconv9.frag
+++ b/tests/glslparsertest/glsl2/gst-gl-hconv9.frag
@@ -35,7 +35,7 @@ uniform float kernel[9];
 
 void main () {
 /* float offset[9] = float[9] (-4.0, -3.0, -2.0, -1.0, 0.0, 1.0, 2.0, 3.0, 4.0); */
-/* don't use array constructor so we don't have to depend on #version 120 */
+/* don't use array constructor so we don't have to depend on  */
   float offset[9];
   offset[0] = -4.0;
   offset[1] = -3.0;
diff --git a/tests/glslparsertest/glsl2/gst-gl-sobel.frag b/tests/glslparsertest/glsl2/gst-gl-sobel.frag
index fa797e6f..d0f62862 100644
--- a/tests/glslparsertest/glsl2/gst-gl-sobel.frag
+++ b/tests/glslparsertest/glsl2/gst-gl-sobel.frag
@@ -27,7 +27,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#version 120
+
 /* The #version was added by anholt in converting to piglit due to the
  * use of the array constructor.
  */
diff --git a/tests/glslparsertest/glsl2/gst-gl-vconv9.frag b/tests/glslparsertest/glsl2/gst-gl-vconv9.frag
index e6cdeb1c..4025f709 100644
--- a/tests/glslparsertest/glsl2/gst-gl-vconv9.frag
+++ b/tests/glslparsertest/glsl2/gst-gl-vconv9.frag
@@ -27,7 +27,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#version 120
+
 /* The #version was added by anholt in converting to piglit due to the
  * use of the array constructor.
  */
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-01.vert b/tests/glslparsertest/glsl2/implicit-conversion-01.vert
index 137a30d3..ba1811b0 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-01.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-01.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-02.vert b/tests/glslparsertest/glsl2/implicit-conversion-02.vert
index f8294874..85b4337c 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-02.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-02.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-03.vert b/tests/glslparsertest/glsl2/implicit-conversion-03.vert
index a919abb9..cd33bb96 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-03.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-03.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-04.vert b/tests/glslparsertest/glsl2/implicit-conversion-04.vert
index 93592500..e3fa30de 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-04.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-04.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-05.vert b/tests/glslparsertest/glsl2/implicit-conversion-05.vert
index 65bc834c..0d697fe4 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-05.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-05.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-06.vert b/tests/glslparsertest/glsl2/implicit-conversion-06.vert
index af2f1ff5..e68934b4 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-06.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-06.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-07.vert b/tests/glslparsertest/glsl2/implicit-conversion-07.vert
index 1e5a0d0a..397c6003 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-07.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-07.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-08.vert b/tests/glslparsertest/glsl2/implicit-conversion-08.vert
index 5efc04f2..56781160 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-08.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-08.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-09.vert b/tests/glslparsertest/glsl2/implicit-conversion-09.vert
index 0fa049a9..5f235f47 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-09.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-09.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/implicit-conversion-10.vert b/tests/glslparsertest/glsl2/implicit-conversion-10.vert
index 52b0e59a..a2c11562 100644
--- a/tests/glslparsertest/glsl2/implicit-conversion-10.vert
+++ b/tests/glslparsertest/glsl2/implicit-conversion-10.vert
@@ -3,7 +3,7 @@
  * glsl_version: 1.20
  * [end config]
  */
-#version 120
+
 
 void main()
 {
diff --git a/tests/glslparsertest/glsl2/invariant-01.vert b/tests/glslparsertest/glsl2/invariant-01.vert
index 42355ca6..b3bd58ce 100644
--- a/tests/glslparsertest/glsl2/invariant-01.vert
+++ b/tests/glslparsertest/glsl2/invariant-01.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS - based on examples in the GLSL 1.20 spec */
-#version 120
+
 
 invariant gl_Position;
 
diff --git a/tests/glslparsertest/glsl2/invariant-02.vert b/tests/glslparsertest/glsl2/invariant-02.vert
index 6164219e..b5bb6a2a 100644
--- a/tests/glslparsertest/glsl2/invariant-02.vert
+++ b/tests/glslparsertest/glsl2/invariant-02.vert
@@ -14,7 +14,7 @@
  *     "The invariant keyword can be followed by a comma separated list of
  *     previously declared identifiers."
  */
-#version 120
+
 
 invariant gl_Position, gl_FrontColor, gl_BackColor;
 
diff --git a/tests/glslparsertest/glsl2/invariant-03.vert b/tests/glslparsertest/glsl2/invariant-03.vert
index 935b0578..f5b2a933 100644
--- a/tests/glslparsertest/glsl2/invariant-03.vert
+++ b/tests/glslparsertest/glsl2/invariant-03.vert
@@ -14,7 +14,7 @@
  *     "All uses of invariant must be at the global scope, and before any use
  *     of the variables being declared as invariant."
  */
-#version 120
+
 
 void main() 
 {
diff --git a/tests/glslparsertest/glsl2/invariant-04.vert b/tests/glslparsertest/glsl2/invariant-04.vert
index 16ad284b..c80a429e 100644
--- a/tests/glslparsertest/glsl2/invariant-04.vert
+++ b/tests/glslparsertest/glsl2/invariant-04.vert
@@ -15,7 +15,7 @@
  *     invariance....All uses of invariant must be at the global scope, and
  *     before any use of the variables being declared as invariant."
  */
-#version 120
+
 
 void main() 
 {
diff --git a/tests/glslparsertest/glsl2/invariant-05.vert b/tests/glslparsertest/glsl2/invariant-05.vert
index c1cbc053..bfeda523 100644
--- a/tests/glslparsertest/glsl2/invariant-05.vert
+++ b/tests/glslparsertest/glsl2/invariant-05.vert
@@ -14,7 +14,7 @@
  *     "All uses of invariant must be at the global scope, and before any use
  *     of the variables being declared as invariant."
  */
-#version 120
+
 
 void main() 
 {
diff --git a/tests/glslparsertest/glsl2/invariant-06.vert b/tests/glslparsertest/glsl2/invariant-06.vert
index 7d68aa13..a8996a97 100644
--- a/tests/glslparsertest/glsl2/invariant-06.vert
+++ b/tests/glslparsertest/glsl2/invariant-06.vert
@@ -14,7 +14,7 @@
  *     "Only variables output from a vertex shader can be candidates for
  *     invariance."
  */
-#version 120
+
 
 invariant uniform vec2 x;
 
diff --git a/tests/glslparsertest/glsl2/invariant-07.vert b/tests/glslparsertest/glsl2/invariant-07.vert
index 2aceb28c..20c5d163 100644
--- a/tests/glslparsertest/glsl2/invariant-07.vert
+++ b/tests/glslparsertest/glsl2/invariant-07.vert
@@ -14,7 +14,7 @@
  *     "Only variables output from a vertex shader can be candidates for
  *     invariance."
  */
-#version 120
+
 
 invariant attribute vec2 x;
 
diff --git a/tests/glslparsertest/glsl2/invariant-08.vert b/tests/glslparsertest/glsl2/invariant-08.vert
index 695c575d..560ded8f 100644
--- a/tests/glslparsertest/glsl2/invariant-08.vert
+++ b/tests/glslparsertest/glsl2/invariant-08.vert
@@ -14,7 +14,7 @@
  *     "Only variables output from a vertex shader can be candidates for
  *     invariance."
  */
-#version 120
+
 
 invariant vec2 x;
 
diff --git a/tests/glslparsertest/glsl2/local-function-01.frag b/tests/glslparsertest/glsl2/local-function-01.frag
index 0ceb4c9c..74610c67 100644
--- a/tests/glslparsertest/glsl2/local-function-01.frag
+++ b/tests/glslparsertest/glsl2/local-function-01.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - local function declarations are not allowed. */
-#version 120
+
 void main() {
     float foo(float x);
     gl_FragColor = vec4(0.0, foo(0.5), 0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/local-function-02.frag b/tests/glslparsertest/glsl2/local-function-02.frag
index dc52f57b..d9b7e428 100644
--- a/tests/glslparsertest/glsl2/local-function-02.frag
+++ b/tests/glslparsertest/glsl2/local-function-02.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL */
-#version 120
+
 void main() {
     float foo(float x) {
         return x + 0.5;
diff --git a/tests/glslparsertest/glsl2/local-function-03.frag b/tests/glslparsertest/glsl2/local-function-03.frag
index 1ee171c2..f91fd294 100644
--- a/tests/glslparsertest/glsl2/local-function-03.frag
+++ b/tests/glslparsertest/glsl2/local-function-03.frag
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS - local function declarations are not allowed in GLSL 1.10. */
-#version 110
+
 void main() {
     float foo(float x);
     gl_FragColor = vec4(0.0, foo(0.5), 0.0, 1.0);
diff --git a/tests/glslparsertest/glsl2/matrix-08.vert b/tests/glslparsertest/glsl2/matrix-08.vert
index 1ee5b263..239c9c38 100644
--- a/tests/glslparsertest/glsl2/matrix-08.vert
+++ b/tests/glslparsertest/glsl2/matrix-08.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* PASS */
 
 uniform mat2x3 a;
diff --git a/tests/glslparsertest/glsl2/matrix-10.vert b/tests/glslparsertest/glsl2/matrix-10.vert
index 7d1918db..d5a6d0bb 100644
--- a/tests/glslparsertest/glsl2/matrix-10.vert
+++ b/tests/glslparsertest/glsl2/matrix-10.vert
@@ -7,7 +7,7 @@
 // # NOTE: 6cc17ae70b70d150aa1751f8e28db7b2a9bd50f0
 // [end config]
 
-#version 120
+
 /* PASS */
 
 uniform mat3 a;
diff --git a/tests/glslparsertest/glsl2/pragma-08.frag b/tests/glslparsertest/glsl2/pragma-08.frag
index 86973c82..50d0ce63 100644
--- a/tests/glslparsertest/glsl2/pragma-08.frag
+++ b/tests/glslparsertest/glsl2/pragma-08.frag
@@ -11,7 +11,7 @@
  *
  * Based on the Regnum Online shader in bugzilla #28138.
  * */
-#version 120
+
 
 #line 336
 #extension GL_ARB_texture_rectangle : enable
diff --git a/tests/glslparsertest/glsl2/redeclaration-10.vert b/tests/glslparsertest/glsl2/redeclaration-10.vert
index 5f79df1a..1db09173 100644
--- a/tests/glslparsertest/glsl2/redeclaration-10.vert
+++ b/tests/glslparsertest/glsl2/redeclaration-10.vert
@@ -12,7 +12,7 @@
  * See also redeclaration-09.vert (passes in 1.10) and redeclaration-11.vert
  * (where the variable declaration is legal, but still hides the function).
  */
-#version 120
+
 float foo()
 {
     return 0.5;
diff --git a/tests/glslparsertest/glsl2/redeclaration-11.vert b/tests/glslparsertest/glsl2/redeclaration-11.vert
index b566cad2..282fa6e9 100644
--- a/tests/glslparsertest/glsl2/redeclaration-11.vert
+++ b/tests/glslparsertest/glsl2/redeclaration-11.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - in 1.20, variables hide functions, so the call is illegal. */
-#version 120
+
 
 void foo(vec4 vs) {
    gl_Position = vs;
diff --git a/tests/glslparsertest/glsl2/redeclaration-14.vert b/tests/glslparsertest/glsl2/redeclaration-14.vert
index 5de17b6c..65ce3524 100644
--- a/tests/glslparsertest/glsl2/redeclaration-14.vert
+++ b/tests/glslparsertest/glsl2/redeclaration-14.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS - built-in exp is outside the global scope */
-#version 120
+
 uniform float exp;
 
 void main()
diff --git a/tests/glslparsertest/glsl2/redeclaration-15.vert b/tests/glslparsertest/glsl2/redeclaration-15.vert
index 6aa1226c..20608512 100644
--- a/tests/glslparsertest/glsl2/redeclaration-15.vert
+++ b/tests/glslparsertest/glsl2/redeclaration-15.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* FAIL - built-in exp hidden by variable */
-#version 120
+
 uniform float exp;
 
 void main()
diff --git a/tests/glslparsertest/glsl2/return-conversion-03.vert b/tests/glslparsertest/glsl2/return-conversion-03.vert
index 0d5aa403..5c6eb612 100644
--- a/tests/glslparsertest/glsl2/return-conversion-03.vert
+++ b/tests/glslparsertest/glsl2/return-conversion-03.vert
@@ -12,7 +12,7 @@
  * mention of implicit conversions occuring on the expression of a return
  * statement.
  */
-#version 120
+
 
 float function(int i)
 {
diff --git a/tests/glslparsertest/glsl2/sampler-04.frag b/tests/glslparsertest/glsl2/sampler-04.frag
index 22b1b244..04215e13 100644
--- a/tests/glslparsertest/glsl2/sampler-04.frag
+++ b/tests/glslparsertest/glsl2/sampler-04.frag
@@ -14,7 +14,7 @@
  *    "Samplers cannot be treated as l-values; hence cannot be used as
  *     out or inout function parameters, nor can they be assigned into."
  */
-#version 120
+
 
 uniform sampler2D u[4];
 varying vec2 coord;
diff --git a/tests/glslparsertest/glsl2/uniform-01.vert b/tests/glslparsertest/glsl2/uniform-01.vert
index 694fc281..bcd98840 100644
--- a/tests/glslparsertest/glsl2/uniform-01.vert
+++ b/tests/glslparsertest/glsl2/uniform-01.vert
@@ -8,7 +8,7 @@
 // [end config]
 
 /* PASS */
-#version 120
+
 uniform vec2 a = vec2(1.0, 2.0);
 
 void main()