diff options
author | Matt Turner <mattst88@gmail.com> | 2013-11-04 18:15:06 -0800 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2013-11-05 13:18:02 -0800 |
commit | 67174fbcf797b4a129250db1a3c001974e7522ad (patch) | |
tree | 0ba300552de90e19e7436a0714c0b023c5c147d1 | |
parent | c1b0098ea9f2603bef85b84225ca74a3d86deec1 (diff) |
shaders: Remove #version from glsl-const tests.
Also basically a revert of 6533d757 to make the cosh test match.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
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 02ec32943..880f297d0 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 ef7b32964..530c797a1 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 ff5bf6faa..0f795752d 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 ea6c15417..c61b77cff 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 8185d4226..56206eca7 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 19cae64e4..f34927f4a 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 60d01142f..0d752e7b2 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 7979f8910..1dc0ea113 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 53aab1c7b..448cf1bb0 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 899cec9aa..5d799b1d5 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 e83b78f2a..b3aff43a3 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 c2891460f..ccf1861bd 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 29180cc3c..9bae9a88d 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 904bb5b7f..7dbb3e123 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 2f987c6f0..8ce378852 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 b0edc0ec2..f14608a18 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 cea8fb38d..f39d33acb 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 3686bb89a..0e088e453 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 ed5be856e..f71945144 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 2803bbdb8..38afcda72 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 fec524cf5..3f4f5ce41 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 f77af3620..8eef4cef3 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 e07948256..54ae6395a 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 18f61f866..ba649b937 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 62fd62932..0c6705c8b 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 b6a71bf99..2001fbe11 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 46277d14a..91b894e41 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 c1acf431b..2a483b480 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 3d1d3d28e..e2e9f3303 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 da677767b..3fbb85d67 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 b8d116255..c2491905d 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 0a40c091d..a5e02569a 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 f76e4b295..4666a2803 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 ba514697b..20334755c 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 0d333f121..8c677b4ce 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 883d3b5a0..1dad91f50 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 c1bdd5510..591b87493 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 8e12a48af..6359c95b5 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 f79bc610c..d875f599a 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 e534885fa..199be990b 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 afffab5f2..2b1f1f699 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 60f9866c8..823570c92 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 bf7b6efac..4b45bc7b9 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 67e945a8e..d18035106 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 f2d7fbfb9..91e755a80 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 f7af4dee4..a85eca4b5 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 642c30927..4414357fb 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 7ce40c355..21e4884da 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 a8dcd262b..a2e0f7ef9 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 f8b256826..ebc90725e 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 1954d935a..19610ae05 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 649076fa9..ed1cf870b 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 5a5a74c1f..b3d0bb6c0 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 e149e6535..2980dff8b 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 2d5b4cd4e..31b728276 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 6825c5d03..7f1c71ff3 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 ff5fc6dea..076ed68b3 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 a8e13b47a..49c3fd18b 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 525c0e201..9a7373f2b 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 a66c9a853..93a2ea542 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 a93cd605d..3d36a10a4 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 5a7394e60..280cc8cad 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 6029f6a06..4278f1afe 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 236271e67..44921705c 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 e8e206d24..560da73e6 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 4465a1928..4dbe1714f 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 5818a20bf..23b124c52 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 2cc750b56..4da157a1c 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 09b17eb8d..92e30e441 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 e34249960..15b2476f8 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. |