On 11/04/2013 10:27 PM, Matt Turner wrote: > Also basically a revert of 6533d757 to make the cosh test match.
Reviewed-by: Ian Romanick <[email protected]> I see that these tests use [vertex shader file] glsl-mvp.vert Maybe a follow-up patch to convert them to [vertex shader passthrough]? > --- > tests/shaders/glsl-const-builtin-abs.shader_test | 1 - > tests/shaders/glsl-const-builtin-acos.shader_test | 1 - > tests/shaders/glsl-const-builtin-all.shader_test | 1 - > tests/shaders/glsl-const-builtin-any.shader_test | 1 - > tests/shaders/glsl-const-builtin-asin.shader_test | 1 - > tests/shaders/glsl-const-builtin-atan.shader_test | 1 - > tests/shaders/glsl-const-builtin-ceil.shader_test | 1 - > tests/shaders/glsl-const-builtin-clamp.shader_test | 1 - > tests/shaders/glsl-const-builtin-cos.shader_test | 1 - > tests/shaders/glsl-const-builtin-cosh.shader_test | 9 ++------- > tests/shaders/glsl-const-builtin-cross.shader_test | 1 - > tests/shaders/glsl-const-builtin-degrees.shader_test | 1 - > tests/shaders/glsl-const-builtin-derivatives.shader_test | 1 - > tests/shaders/glsl-const-builtin-distance.shader_test | 1 - > tests/shaders/glsl-const-builtin-dot.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-02.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-03.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-04.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-05.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-06.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-07.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-08.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-09.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-10.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal-bool.shader_test | 1 - > tests/shaders/glsl-const-builtin-equal.shader_test | 1 - > tests/shaders/glsl-const-builtin-exp.shader_test | 1 - > tests/shaders/glsl-const-builtin-exp2.shader_test | 1 - > tests/shaders/glsl-const-builtin-faceforward.shader_test | 1 - > tests/shaders/glsl-const-builtin-floor.shader_test | 1 - > tests/shaders/glsl-const-builtin-fract.shader_test | 1 - > tests/shaders/glsl-const-builtin-greaterThan.shader_test | 1 - > tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test | 1 - > tests/shaders/glsl-const-builtin-inversesqrt.shader_test | 1 - > tests/shaders/glsl-const-builtin-length.shader_test | 1 - > tests/shaders/glsl-const-builtin-lessThan.shader_test | 1 - > tests/shaders/glsl-const-builtin-lessThanEqual.shader_test | 1 - > tests/shaders/glsl-const-builtin-log.shader_test | 1 - > tests/shaders/glsl-const-builtin-log2.shader_test | 1 - > tests/shaders/glsl-const-builtin-matrixCompMult.shader_test | 1 - > tests/shaders/glsl-const-builtin-max.shader_test | 1 - > tests/shaders/glsl-const-builtin-min.shader_test | 1 - > tests/shaders/glsl-const-builtin-mix.shader_test | 1 - > tests/shaders/glsl-const-builtin-mod.shader_test | 1 - > tests/shaders/glsl-const-builtin-normalize.shader_test | 1 - > tests/shaders/glsl-const-builtin-not.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-02.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-03.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-04.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-05.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-06.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-07.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-08.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-09.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-10.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual-bool.shader_test | 1 - > tests/shaders/glsl-const-builtin-notEqual.shader_test | 1 - > tests/shaders/glsl-const-builtin-outerProduct.shader_test | 1 - > tests/shaders/glsl-const-builtin-pow.shader_test | 1 - > tests/shaders/glsl-const-builtin-radians.shader_test | 1 - > tests/shaders/glsl-const-builtin-reflect.shader_test | 1 - > tests/shaders/glsl-const-builtin-refract.shader_test | 1 - > tests/shaders/glsl-const-builtin-sign.shader_test | 1 - > tests/shaders/glsl-const-builtin-sin.shader_test | 1 - > tests/shaders/glsl-const-builtin-smoothstep.shader_test | 1 - > tests/shaders/glsl-const-builtin-sqrt.shader_test | 1 - > tests/shaders/glsl-const-builtin-step.shader_test | 1 - > tests/shaders/glsl-const-builtin-tan.shader_test | 1 - > tests/shaders/glsl-const-builtin-transpose.shader_test | 1 - > tests/shaders/glsl-const-folding-01.shader_test | 1 - > 70 files changed, 2 insertions(+), 76 deletions(-) > > diff --git a/tests/shaders/glsl-const-builtin-abs.shader_test > b/tests/shaders/glsl-const-builtin-abs.shader_test > index 02ec329..880f297 100644 > --- a/tests/shaders/glsl-const-builtin-abs.shader_test > +++ b/tests/shaders/glsl-const-builtin-abs.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = abs(-0.5); > diff --git a/tests/shaders/glsl-const-builtin-acos.shader_test > b/tests/shaders/glsl-const-builtin-acos.shader_test > index ef7b329..530c797 100644 > --- a/tests/shaders/glsl-const-builtin-acos.shader_test > +++ b/tests/shaders/glsl-const-builtin-acos.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float zero = acos(1.0); > const float half_pi = acos(0.0); > diff --git a/tests/shaders/glsl-const-builtin-all.shader_test > b/tests/shaders/glsl-const-builtin-all.shader_test > index ff5bf6f..0f79575 100644 > --- a/tests/shaders/glsl-const-builtin-all.shader_test > +++ b/tests/shaders/glsl-const-builtin-all.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 v_true = bvec2(true, true); > diff --git a/tests/shaders/glsl-const-builtin-any.shader_test > b/tests/shaders/glsl-const-builtin-any.shader_test > index ea6c154..c61b77c 100644 > --- a/tests/shaders/glsl-const-builtin-any.shader_test > +++ b/tests/shaders/glsl-const-builtin-any.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 v_true = bvec2(true, true); > diff --git a/tests/shaders/glsl-const-builtin-asin.shader_test > b/tests/shaders/glsl-const-builtin-asin.shader_test > index 8185d42..56206ec 100644 > --- a/tests/shaders/glsl-const-builtin-asin.shader_test > +++ b/tests/shaders/glsl-const-builtin-asin.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float zero = asin(0.0); > const float pi_over_three = asin(0.866025403784439); > diff --git a/tests/shaders/glsl-const-builtin-atan.shader_test > b/tests/shaders/glsl-const-builtin-atan.shader_test > index 19cae64..f34927f 100644 > --- a/tests/shaders/glsl-const-builtin-atan.shader_test > +++ b/tests/shaders/glsl-const-builtin-atan.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float x = atan(100.0, 100.0); > const float y = atan(1.0); > diff --git a/tests/shaders/glsl-const-builtin-ceil.shader_test > b/tests/shaders/glsl-const-builtin-ceil.shader_test > index 60d0114..0d752e7 100644 > --- a/tests/shaders/glsl-const-builtin-ceil.shader_test > +++ b/tests/shaders/glsl-const-builtin-ceil.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = ceil(-0.5); > diff --git a/tests/shaders/glsl-const-builtin-clamp.shader_test > b/tests/shaders/glsl-const-builtin-clamp.shader_test > index 7979f89..1dc0ea1 100644 > --- a/tests/shaders/glsl-const-builtin-clamp.shader_test > +++ b/tests/shaders/glsl-const-builtin-clamp.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v1 = clamp(vec2(-10.0, -15.0), vec2(-5.0, 5.0), vec2(1.0, > 10.0)); > diff --git a/tests/shaders/glsl-const-builtin-cos.shader_test > b/tests/shaders/glsl-const-builtin-cos.shader_test > index 53aab1c..448cf1b 100644 > --- a/tests/shaders/glsl-const-builtin-cos.shader_test > +++ b/tests/shaders/glsl-const-builtin-cos.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float sqrt_two_over_two = cos(0.785398163397448); > const float one = cos(0.0); > diff --git a/tests/shaders/glsl-const-builtin-cosh.shader_test > b/tests/shaders/glsl-const-builtin-cosh.shader_test > index 899cec9..5d799b1 100644 > --- a/tests/shaders/glsl-const-builtin-cosh.shader_test > +++ b/tests/shaders/glsl-const-builtin-cosh.shader_test > @@ -1,15 +1,10 @@ > [require] > GLSL >= 1.30 > > -[vertex shader] > -#version 130 > -void main() > -{ > - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; > -} > +[vertex shader file] > +glsl-mvp.vert > > [fragment shader] > -#version 130 > void main() { > const float f_154 = cosh(1.0); > const float f_376 = cosh(2.0); > diff --git a/tests/shaders/glsl-const-builtin-cross.shader_test > b/tests/shaders/glsl-const-builtin-cross.shader_test > index e83b78f..b3aff43 100644 > --- a/tests/shaders/glsl-const-builtin-cross.shader_test > +++ b/tests/shaders/glsl-const-builtin-cross.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v1 = vec3(3.0, -3.0, 1.0); > diff --git a/tests/shaders/glsl-const-builtin-degrees.shader_test > b/tests/shaders/glsl-const-builtin-degrees.shader_test > index c289146..ccf1861 100644 > --- a/tests/shaders/glsl-const-builtin-degrees.shader_test > +++ b/tests/shaders/glsl-const-builtin-degrees.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const int x = int(degrees(3.1415926535)); > if (x == 180) > diff --git a/tests/shaders/glsl-const-builtin-derivatives.shader_test > b/tests/shaders/glsl-const-builtin-derivatives.shader_test > index 29180cc..9bae9a8 100644 > --- a/tests/shaders/glsl-const-builtin-derivatives.shader_test > +++ b/tests/shaders/glsl-const-builtin-derivatives.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float dx = dFdx(0.0); > const float dy = dFdy(0.0); > diff --git a/tests/shaders/glsl-const-builtin-distance.shader_test > b/tests/shaders/glsl-const-builtin-distance.shader_test > index 904bb5b..7dbb3e1 100644 > --- a/tests/shaders/glsl-const-builtin-distance.shader_test > +++ b/tests/shaders/glsl-const-builtin-distance.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 p0 = vec2(1.2, 3.4); > diff --git a/tests/shaders/glsl-const-builtin-dot.shader_test > b/tests/shaders/glsl-const-builtin-dot.shader_test > index 2f987c6..8ce3788 100644 > --- a/tests/shaders/glsl-const-builtin-dot.shader_test > +++ b/tests/shaders/glsl-const-builtin-dot.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 c1 = vec2(2.0, 4.0); > diff --git a/tests/shaders/glsl-const-builtin-equal-02.shader_test > b/tests/shaders/glsl-const-builtin-equal-02.shader_test > index b0edc0e..f14608a 100644 > --- a/tests/shaders/glsl-const-builtin-equal-02.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-02.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = equal(vec2(3.0, 3.14), > diff --git a/tests/shaders/glsl-const-builtin-equal-03.shader_test > b/tests/shaders/glsl-const-builtin-equal-03.shader_test > index cea8fb3..f39d33a 100644 > --- a/tests/shaders/glsl-const-builtin-equal-03.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-03.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = equal(vec3(13.4, -0.9, 12.55), > diff --git a/tests/shaders/glsl-const-builtin-equal-04.shader_test > b/tests/shaders/glsl-const-builtin-equal-04.shader_test > index 3686bb8..0e088e4 100644 > --- a/tests/shaders/glsl-const-builtin-equal-04.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-04.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = equal(vec4(-2.0, 0.0, 0.123, -1000.5), > diff --git a/tests/shaders/glsl-const-builtin-equal-05.shader_test > b/tests/shaders/glsl-const-builtin-equal-05.shader_test > index ed5be85..f719451 100644 > --- a/tests/shaders/glsl-const-builtin-equal-05.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-05.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = equal(ivec2(-8, 12), > diff --git a/tests/shaders/glsl-const-builtin-equal-06.shader_test > b/tests/shaders/glsl-const-builtin-equal-06.shader_test > index 2803bbd..38afcda 100644 > --- a/tests/shaders/glsl-const-builtin-equal-06.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-06.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = equal(ivec3(0, 8, 89), > diff --git a/tests/shaders/glsl-const-builtin-equal-07.shader_test > b/tests/shaders/glsl-const-builtin-equal-07.shader_test > index fec524c..3f4f5ce 100644 > --- a/tests/shaders/glsl-const-builtin-equal-07.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-07.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = equal(ivec4(11, 1000, 1, -18), > diff --git a/tests/shaders/glsl-const-builtin-equal-08.shader_test > b/tests/shaders/glsl-const-builtin-equal-08.shader_test > index f77af36..8eef4ce 100644 > --- a/tests/shaders/glsl-const-builtin-equal-08.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-08.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = equal(bvec2(true, false), > diff --git a/tests/shaders/glsl-const-builtin-equal-09.shader_test > b/tests/shaders/glsl-const-builtin-equal-09.shader_test > index e079482..54ae639 100644 > --- a/tests/shaders/glsl-const-builtin-equal-09.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-09.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = equal(bvec3(false, true, false), > diff --git a/tests/shaders/glsl-const-builtin-equal-10.shader_test > b/tests/shaders/glsl-const-builtin-equal-10.shader_test > index 18f61f8..ba649b9 100644 > --- a/tests/shaders/glsl-const-builtin-equal-10.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-10.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = equal(bvec4(true, false, false, true), > diff --git a/tests/shaders/glsl-const-builtin-equal-bool.shader_test > b/tests/shaders/glsl-const-builtin-equal-bool.shader_test > index 62fd629..0c6705c 100644 > --- a/tests/shaders/glsl-const-builtin-equal-bool.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal-bool.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const bvec3 x = bvec3(false, false, true); > const bvec3 y = bvec3(true, false, false); > diff --git a/tests/shaders/glsl-const-builtin-equal.shader_test > b/tests/shaders/glsl-const-builtin-equal.shader_test > index b6a71bf..2001fbe 100644 > --- a/tests/shaders/glsl-const-builtin-equal.shader_test > +++ b/tests/shaders/glsl-const-builtin-equal.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-exp.shader_test > b/tests/shaders/glsl-const-builtin-exp.shader_test > index 46277d1..91b894e 100644 > --- a/tests/shaders/glsl-const-builtin-exp.shader_test > +++ b/tests/shaders/glsl-const-builtin-exp.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v = exp(vec3(0.0, -2.0, 4.0)); > diff --git a/tests/shaders/glsl-const-builtin-exp2.shader_test > b/tests/shaders/glsl-const-builtin-exp2.shader_test > index c1acf43..2a483b4 100644 > --- a/tests/shaders/glsl-const-builtin-exp2.shader_test > +++ b/tests/shaders/glsl-const-builtin-exp2.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float one_half = exp2(16.0) - 65535.5; > diff --git a/tests/shaders/glsl-const-builtin-faceforward.shader_test > b/tests/shaders/glsl-const-builtin-faceforward.shader_test > index 3d1d3d2..e2e9f33 100644 > --- a/tests/shaders/glsl-const-builtin-faceforward.shader_test > +++ b/tests/shaders/glsl-const-builtin-faceforward.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v1 = vec2(1.0, 2.0); > diff --git a/tests/shaders/glsl-const-builtin-floor.shader_test > b/tests/shaders/glsl-const-builtin-floor.shader_test > index da67776..3fbb85d 100644 > --- a/tests/shaders/glsl-const-builtin-floor.shader_test > +++ b/tests/shaders/glsl-const-builtin-floor.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = floor(-0.5); > diff --git a/tests/shaders/glsl-const-builtin-fract.shader_test > b/tests/shaders/glsl-const-builtin-fract.shader_test > index b8d1162..c249190 100644 > --- a/tests/shaders/glsl-const-builtin-fract.shader_test > +++ b/tests/shaders/glsl-const-builtin-fract.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = fract(1.7); > diff --git a/tests/shaders/glsl-const-builtin-greaterThan.shader_test > b/tests/shaders/glsl-const-builtin-greaterThan.shader_test > index 0a40c09..a5e0256 100644 > --- a/tests/shaders/glsl-const-builtin-greaterThan.shader_test > +++ b/tests/shaders/glsl-const-builtin-greaterThan.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test > b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test > index f76e4b2..4666a28 100644 > --- a/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test > +++ b/tests/shaders/glsl-const-builtin-greaterThanEqual.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test > b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test > index ba51469..2033475 100644 > --- a/tests/shaders/glsl-const-builtin-inversesqrt.shader_test > +++ b/tests/shaders/glsl-const-builtin-inversesqrt.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v = inversesqrt(vec3(16.0)); > diff --git a/tests/shaders/glsl-const-builtin-length.shader_test > b/tests/shaders/glsl-const-builtin-length.shader_test > index 0d333f1..8c677b4 100644 > --- a/tests/shaders/glsl-const-builtin-length.shader_test > +++ b/tests/shaders/glsl-const-builtin-length.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v = vec2(12.0, -5.0); > diff --git a/tests/shaders/glsl-const-builtin-lessThan.shader_test > b/tests/shaders/glsl-const-builtin-lessThan.shader_test > index 883d3b5..1dad91f 100644 > --- a/tests/shaders/glsl-const-builtin-lessThan.shader_test > +++ b/tests/shaders/glsl-const-builtin-lessThan.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test > b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test > index c1bdd55..591b874 100644 > --- a/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test > +++ b/tests/shaders/glsl-const-builtin-lessThanEqual.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-log.shader_test > b/tests/shaders/glsl-const-builtin-log.shader_test > index 8e12a48..6359c95 100644 > --- a/tests/shaders/glsl-const-builtin-log.shader_test > +++ b/tests/shaders/glsl-const-builtin-log.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v = log(vec3(1.0, 0.1353352832366127, 54.598150033144236)); > diff --git a/tests/shaders/glsl-const-builtin-log2.shader_test > b/tests/shaders/glsl-const-builtin-log2.shader_test > index f79bc61..d875f59 100644 > --- a/tests/shaders/glsl-const-builtin-log2.shader_test > +++ b/tests/shaders/glsl-const-builtin-log2.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v = log2(vec3(1.0, 8.0, 65536.0)); > diff --git a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test > b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test > index e534885..199be99 100644 > --- a/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test > +++ b/tests/shaders/glsl-const-builtin-matrixCompMult.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const mat2 m1 = mat2(1.0, 2.0, 4.0, 8.0); > diff --git a/tests/shaders/glsl-const-builtin-max.shader_test > b/tests/shaders/glsl-const-builtin-max.shader_test > index afffab5..2b1f1f6 100644 > --- a/tests/shaders/glsl-const-builtin-max.shader_test > +++ b/tests/shaders/glsl-const-builtin-max.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = max(0.25, -5.0); > diff --git a/tests/shaders/glsl-const-builtin-min.shader_test > b/tests/shaders/glsl-const-builtin-min.shader_test > index 60f9866..823570c 100644 > --- a/tests/shaders/glsl-const-builtin-min.shader_test > +++ b/tests/shaders/glsl-const-builtin-min.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float x = min(0.25, 0.5); > diff --git a/tests/shaders/glsl-const-builtin-mix.shader_test > b/tests/shaders/glsl-const-builtin-mix.shader_test > index bf7b6ef..4b45bc7 100644 > --- a/tests/shaders/glsl-const-builtin-mix.shader_test > +++ b/tests/shaders/glsl-const-builtin-mix.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec4 v1 = vec4(1.0, 0.0, 2.0, 0.0); > diff --git a/tests/shaders/glsl-const-builtin-mod.shader_test > b/tests/shaders/glsl-const-builtin-mod.shader_test > index 67e945a..d180351 100644 > --- a/tests/shaders/glsl-const-builtin-mod.shader_test > +++ b/tests/shaders/glsl-const-builtin-mod.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v1 = mod(vec2(-3.0, 43.5), vec2(0.9, -4.0)); /* (-0.5, 0.6) */ > diff --git a/tests/shaders/glsl-const-builtin-normalize.shader_test > b/tests/shaders/glsl-const-builtin-normalize.shader_test > index f2d7fbf..91e755a 100644 > --- a/tests/shaders/glsl-const-builtin-normalize.shader_test > +++ b/tests/shaders/glsl-const-builtin-normalize.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v = normalize(vec2(1.0, 1.0)); > diff --git a/tests/shaders/glsl-const-builtin-not.shader_test > b/tests/shaders/glsl-const-builtin-not.shader_test > index f7af4de..a85eca4 100644 > --- a/tests/shaders/glsl-const-builtin-not.shader_test > +++ b/tests/shaders/glsl-const-builtin-not.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 v = not(bvec4(true, false, true, false)); > diff --git a/tests/shaders/glsl-const-builtin-notEqual-02.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-02.shader_test > index 642c309..4414357 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-02.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-02.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = notEqual(vec2(3.0, 3.14), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-03.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-03.shader_test > index 7ce40c3..21e4884 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-03.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-03.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = notEqual(vec3(13.4, -0.9, 12.55), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-04.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-04.shader_test > index a8dcd26..a2e0f7e 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-04.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-04.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = notEqual(vec4(-2.0, 0.0, 0.123, -1000.5), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-05.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-05.shader_test > index f8b2568..ebc9072 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-05.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-05.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = notEqual(ivec2(-8, 12), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-06.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-06.shader_test > index 1954d93..19610ae 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-06.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-06.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = notEqual(ivec3(0, 8, 89), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-07.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-07.shader_test > index 649076f..ed1cf87 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-07.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-07.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = notEqual(ivec4(11, 1000, 1, -18), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-08.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-08.shader_test > index 5a5a74c..b3d0bb6 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-08.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-08.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec2 res = notEqual(bvec2(true, false), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-09.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-09.shader_test > index e149e65..2980dff 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-09.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-09.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec3 res = notEqual(bvec3(false, true, false), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-10.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-10.shader_test > index 2d5b4cd..31b7282 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-10.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-10.shader_test > @@ -6,7 +6,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const bvec4 res = notEqual(bvec4(true, false, false, true), > diff --git a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test > b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test > index 6825c5d..7f1c71f 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const bvec3 x = bvec3(false, false, true); > const bvec3 y = bvec3(false, true, true); > diff --git a/tests/shaders/glsl-const-builtin-notEqual.shader_test > b/tests/shaders/glsl-const-builtin-notEqual.shader_test > index ff5fc6d..076ed68 100644 > --- a/tests/shaders/glsl-const-builtin-notEqual.shader_test > +++ b/tests/shaders/glsl-const-builtin-notEqual.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const vec3 small = vec3(1.0, 2.0, 3.0); > const vec3 large = vec3(0.5, 2.0, 6.0); > diff --git a/tests/shaders/glsl-const-builtin-outerProduct.shader_test > b/tests/shaders/glsl-const-builtin-outerProduct.shader_test > index a8e13b4..49c3fd1 100644 > --- a/tests/shaders/glsl-const-builtin-outerProduct.shader_test > +++ b/tests/shaders/glsl-const-builtin-outerProduct.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 u = vec3(2.0, 3.0, 4.0); > diff --git a/tests/shaders/glsl-const-builtin-pow.shader_test > b/tests/shaders/glsl-const-builtin-pow.shader_test > index 525c0e2..9a7373f 100644 > --- a/tests/shaders/glsl-const-builtin-pow.shader_test > +++ b/tests/shaders/glsl-const-builtin-pow.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec2 v = pow(vec2(3,65), vec2(2,0.5)); > diff --git a/tests/shaders/glsl-const-builtin-radians.shader_test > b/tests/shaders/glsl-const-builtin-radians.shader_test > index a66c9a8..93a2ea5 100644 > --- a/tests/shaders/glsl-const-builtin-radians.shader_test > +++ b/tests/shaders/glsl-const-builtin-radians.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const int pi = int(radians(180.0)*100); > if (pi == 314) > diff --git a/tests/shaders/glsl-const-builtin-reflect.shader_test > b/tests/shaders/glsl-const-builtin-reflect.shader_test > index a93cd60..3d36a10 100644 > --- a/tests/shaders/glsl-const-builtin-reflect.shader_test > +++ b/tests/shaders/glsl-const-builtin-reflect.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v1 = vec3(-1.0, 0.0, 0.0); > diff --git a/tests/shaders/glsl-const-builtin-refract.shader_test > b/tests/shaders/glsl-const-builtin-refract.shader_test > index 5a7394e..280cc8c 100644 > --- a/tests/shaders/glsl-const-builtin-refract.shader_test > +++ b/tests/shaders/glsl-const-builtin-refract.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float zero = refract(0.0, 0.0, 2.0); > diff --git a/tests/shaders/glsl-const-builtin-sign.shader_test > b/tests/shaders/glsl-const-builtin-sign.shader_test > index 6029f6a..4278f1a 100644 > --- a/tests/shaders/glsl-const-builtin-sign.shader_test > +++ b/tests/shaders/glsl-const-builtin-sign.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 signs = sign(vec3(0.0, -42.9, 55.7)); > diff --git a/tests/shaders/glsl-const-builtin-sin.shader_test > b/tests/shaders/glsl-const-builtin-sin.shader_test > index 236271e..4492170 100644 > --- a/tests/shaders/glsl-const-builtin-sin.shader_test > +++ b/tests/shaders/glsl-const-builtin-sin.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float sqrt_two_over_two = sin(0.785398163397448); > const float one = sin(1.5707963267949); > diff --git a/tests/shaders/glsl-const-builtin-smoothstep.shader_test > b/tests/shaders/glsl-const-builtin-smoothstep.shader_test > index e8e206d..560da73 100644 > --- a/tests/shaders/glsl-const-builtin-smoothstep.shader_test > +++ b/tests/shaders/glsl-const-builtin-smoothstep.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec3 v = vec3(7.0, 22.0, 20.0); > diff --git a/tests/shaders/glsl-const-builtin-sqrt.shader_test > b/tests/shaders/glsl-const-builtin-sqrt.shader_test > index 4465a19..4dbe171 100644 > --- a/tests/shaders/glsl-const-builtin-sqrt.shader_test > +++ b/tests/shaders/glsl-const-builtin-sqrt.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const float one_half = sqrt(16.0) - 3.5; > diff --git a/tests/shaders/glsl-const-builtin-step.shader_test > b/tests/shaders/glsl-const-builtin-step.shader_test > index 5818a20..23b124c 100644 > --- a/tests/shaders/glsl-const-builtin-step.shader_test > +++ b/tests/shaders/glsl-const-builtin-step.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const vec4 v1 = vec4(1.0, 1.0, 0.0, -1.0); > diff --git a/tests/shaders/glsl-const-builtin-tan.shader_test > b/tests/shaders/glsl-const-builtin-tan.shader_test > index 2cc750b..4da157a 100644 > --- a/tests/shaders/glsl-const-builtin-tan.shader_test > +++ b/tests/shaders/glsl-const-builtin-tan.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() { > const float one = tan(0.785398163397448); > const float sqrt3 = tan(1.0471975511965976); > diff --git a/tests/shaders/glsl-const-builtin-transpose.shader_test > b/tests/shaders/glsl-const-builtin-transpose.shader_test > index 09b17eb..92e30e4 100644 > --- a/tests/shaders/glsl-const-builtin-transpose.shader_test > +++ b/tests/shaders/glsl-const-builtin-transpose.shader_test > @@ -5,7 +5,6 @@ GLSL >= 1.20 > glsl-mvp.vert > > [fragment shader] > -#version 120 > void main() > { > const mat2 m = mat2(1.0, 2.0, 4.0, 8.0); > diff --git a/tests/shaders/glsl-const-folding-01.shader_test > b/tests/shaders/glsl-const-folding-01.shader_test > index e342499..15b2476 100644 > --- a/tests/shaders/glsl-const-folding-01.shader_test > +++ b/tests/shaders/glsl-const-folding-01.shader_test > @@ -8,7 +8,6 @@ glsl-mvp.vert > /* This test requires version 1.20 because it depends on the new constant > * expression rules added in 1.20. > */ > -#version 120 > > /* All references to bad_constant_folding should be optimized away at compile > * time. If not, link errors will be generated, and the test will fail. > _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
