[Piglit] [PATCH 2/2] Remove .shader_test #version / GLSL >= mismatches.
Stuart Abercrombie
sabercrombie at chromium.org
Fri Dec 21 11:27:52 PST 2012
Make GLSL reflect what the shader source specifies.
Remove the explicit #version directives, as these will be inserted based on GLSL >=.
This is part of the effort to get closer to GLES support.
---
tests/shaders/glsl-array-compare-02.shader_test | 4 +---
tests/shaders/glsl-array-compare.shader_test | 4 +---
tests/shaders/glsl-complex-subscript.shader_test | 3 +--
tests/shaders/glsl-invariant-pragma.shader_test | 4 +---
...l-uniform-non-uniform-array-compare.shader_test | 4 +---
5 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/tests/shaders/glsl-array-compare-02.shader_test b/tests/shaders/glsl-array-compare-02.shader_test
index a570042..3ba00c2 100644
--- a/tests/shaders/glsl-array-compare-02.shader_test
+++ b/tests/shaders/glsl-array-compare-02.shader_test
@@ -1,8 +1,7 @@
[require]
-GLSL >= 1.10
+GLSL >= 1.20
[vertex shader]
-#version 120
/* Verify that two arrays can be directly compared correctly.
*/
void main()
@@ -11,7 +10,6 @@ void main()
}
[fragment shader]
-#version 120
void main()
{
diff --git a/tests/shaders/glsl-array-compare.shader_test b/tests/shaders/glsl-array-compare.shader_test
index 17b1950..10a6a01 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,7 +10,6 @@ void main()
}
[fragment shader]
-#version 120
void main()
{
diff --git a/tests/shaders/glsl-complex-subscript.shader_test b/tests/shaders/glsl-complex-subscript.shader_test
index 99e294d..f42fd52 100644
--- a/tests/shaders/glsl-complex-subscript.shader_test
+++ b/tests/shaders/glsl-complex-subscript.shader_test
@@ -1,9 +1,8 @@
[require]
GL >= 2.0
-GLSL >= 1.10
+GLSL >= 1.20
[fragment shader]
-#version 120
void main()
{
diff --git a/tests/shaders/glsl-invariant-pragma.shader_test b/tests/shaders/glsl-invariant-pragma.shader_test
index 399adbd..e91545e 100644
--- a/tests/shaders/glsl-invariant-pragma.shader_test
+++ b/tests/shaders/glsl-invariant-pragma.shader_test
@@ -1,8 +1,7 @@
[require]
-GLSL >= 1.10
+GLSL >= 1.20
[vertex shader]
-#version 120
#pragma STDGL invariant(all)
varying float var;
void main()
@@ -12,7 +11,6 @@ void main()
}
[fragment shader]
-#version 120
invariant varying float var;
void main()
{
diff --git a/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test b/tests/shaders/glsl-uniform-non-uniform-array-compare.shader_test
index d459953..565f93e 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,7 +10,6 @@ void main()
}
[fragment shader]
-#version 120
uniform float ff[2] = float[2](3.3, 3.5);
void main()
--
1.7.7.3
More information about the Piglit
mailing list