diff options
| author | Stuart Abercrombie <sabercrombie@chromium.org> | 2013-01-31 10:17:23 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2013-02-06 10:24:56 -0800 |
| commit | 2501bc4b0e58badff7e5d218cd5eaa1d0ac328cb (patch) | |
| tree | 98ed51eece86492259c1480614c139c92c83691d /tests/shaders | |
| parent | fd0f2756a9d532a8ed417bb5418ca1b9cd6f8962 (diff) | |
shader_tests: Fix mismatched GLSL versions in some shader_test files.
Replace inconsistent GLSL >= / #version with GLSL >= only.
The #version directive will be inserted by shader_runner.
Reviewed-by: Tom Gall <tom.gall@linaro.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Signed-off-by: Stuart Abercrombie <sabercrombie@chromium.org>
Diffstat (limited to 'tests/shaders')
5 files changed, 5 insertions, 17 deletions
diff --git a/tests/shaders/glsl-array-compare-02.shader_test b/tests/shaders/glsl-array-compare-02.shader_test index a570042d..3ba00c27 100644 --- a/tests/shaders/glsl-array-compare-02.shader_test +++ b/tests/shaders/glsl-array-compare-02.shader_test @@ -1,8 +1,7 @@ [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 /* Verify that two arrays can be directly compared correctly. */ void main() @@ -11,7 +10,6 @@ void main() } [fragment shader] -#version 120 void main() { diff --git a/tests/shaders/glsl-array-compare.shader_test b/tests/shaders/glsl-array-compare.shader_test index 17b19506..bd31f65f 100644 --- a/tests/shaders/glsl-array-compare.shader_test +++ b/tests/shaders/glsl-array-compare.shader_test @@ -1,8 +1,7 @@ [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 /* Verify that two arrays can be directly compared correctly. */ void main() @@ -11,8 +10,6 @@ void main() } [fragment shader] -#version 120 - void main() { float ff[2] = float[2](3.3, 3.5); diff --git a/tests/shaders/glsl-complex-subscript.shader_test b/tests/shaders/glsl-complex-subscript.shader_test index 99e294d2..1bd90792 100644 --- a/tests/shaders/glsl-complex-subscript.shader_test +++ b/tests/shaders/glsl-complex-subscript.shader_test @@ -1,10 +1,8 @@ [require] GL >= 2.0 -GLSL >= 1.10 +GLSL >= 1.20 [fragment shader] -#version 120 - void main() { mat2 a; diff --git a/tests/shaders/glsl-invariant-pragma.shader_test b/tests/shaders/glsl-invariant-pragma.shader_test index 399adbd4..e91545e3 100644 --- a/tests/shaders/glsl-invariant-pragma.shader_test +++ b/tests/shaders/glsl-invariant-pragma.shader_test @@ -1,8 +1,7 @@ [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 #pragma STDGL invariant(all) varying float var; void main() @@ -12,7 +11,6 @@ void main() } [fragment shader] -#version 120 invariant varying float var; void main() { diff --git a/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test b/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test index d4599537..a690817d 100644 --- a/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test +++ b/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test @@ -1,8 +1,7 @@ [require] -GLSL >= 1.10 +GLSL >= 1.20 [vertex shader] -#version 120 /* Verify that the uniform array can compare with non-uniform array correctly. */ void main() @@ -11,8 +10,6 @@ void main() } [fragment shader] -#version 120 - uniform float ff[2] = float[2](3.3, 3.5); void main() { |