[Piglit] [PATCH 2/3] shader_runner: remove explicit #version from spec/glsl-1.20 tests
Stuart Abercrombie
sabercrombie at chromium.org
Mon Apr 1 09:52:56 PDT 2013
It will be added based on the GLSL requirement instead.
Same number of passes on Sandy Bridge running all.tests without glean.
Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
---
.../clipping/fixed-clip-enables.shader_test | 1 -
.../vs-clip-vertex-const-accept.shader_test | 2 --
.../vs-clip-vertex-const-reject.shader_test | 2 --
...clip-vertex-different-from-position.shader_test | 2 --
.../clipping/vs-clip-vertex-enables.shader_test | 2 --
.../vs-clip-vertex-equal-to-position.shader_test | 2 --
.../vs-clip-vertex-homogeneity.shader_test | 2 --
.../execution/fs-assign-varied-struct.shader_test | 2 --
.../maximums/gl_MaxClipPlanes.shader_test | 2 --
.../gl_MaxCombinedTextureImageUnits.shader_test | 2 --
.../maximums/gl_MaxDrawBuffers.shader_test | 2 --
.../gl_MaxFragmentUniformComponents.shader_test | 2 --
.../execution/maximums/gl_MaxLights.shader_test | 2 --
.../maximums/gl_MaxTextureCoords.shader_test | 2 --
.../maximums/gl_MaxTextureImageUnits.shader_test | 2 --
.../maximums/gl_MaxTextureUnits.shader_test | 2 --
.../maximums/gl_MaxVaryingFloats.shader_test | 2 --
.../maximums/gl_MaxVertexAttribs.shader_test | 2 --
.../gl_MaxVertexTextureImageUnits.shader_test | 2 --
.../gl_MaxVertexUniformComponents.shader_test | 2 --
...t-float-to-float-float-float-return.shader_test | 1 -
...-out-conversion-int-to-float-return.shader_test | 1 -
.../vs-out-conversion-int-to-float.shader_test | 1 -
.../fs-structure-array.shader_test | 2 --
.../uniform-initializer/fs-structure.shader_test | 2 --
.../vs-structure-array.shader_test | 2 --
.../uniform-initializer/vs-structure.shader_test | 2 --
.../execution/vs-all-equal-bool-array.shader_test | 2 --
.../execution/vs-assign-varied-struct.shader_test | 1 -
29 files changed, 53 deletions(-)
diff --git a/tests/spec/glsl-1.20/execution/clipping/fixed-clip-enables.shader_test b/tests/spec/glsl-1.20/execution/clipping/fixed-clip-enables.shader_test
index 93995a5..f95f222 100644
--- a/tests/spec/glsl-1.20/execution/clipping/fixed-clip-enables.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/fixed-clip-enables.shader_test
@@ -21,7 +21,6 @@
GLSL >= 1.20
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1, 1, 1, 1);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-accept.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-accept.shader_test
index 6c2b56c..286b48e 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-accept.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-accept.shader_test
@@ -18,7 +18,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -27,7 +26,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1.0);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-reject.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-reject.shader_test
index 0bb08ea..ec3783f 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-reject.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-const-reject.shader_test
@@ -18,7 +18,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -27,7 +26,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1.0);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-different-from-position.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-different-from-position.shader_test
index c7dae89..24c8de4 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-different-from-position.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-different-from-position.shader_test
@@ -9,7 +9,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -21,7 +20,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1, 1, 1, 1);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-enables.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-enables.shader_test
index b93d16f..7fdc505 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-enables.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-enables.shader_test
@@ -18,7 +18,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
@@ -27,7 +26,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1, 1, 1, 1);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-equal-to-position.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-equal-to-position.shader_test
index 50b4856..ab8cf80 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-equal-to-position.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-equal-to-position.shader_test
@@ -7,7 +7,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -16,7 +15,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1, 1, 1, 1);
diff --git a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-homogeneity.shader_test b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-homogeneity.shader_test
index 615ecf9..91a5c50 100644
--- a/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-homogeneity.shader_test
+++ b/tests/spec/glsl-1.20/execution/clipping/vs-clip-vertex-homogeneity.shader_test
@@ -13,7 +13,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -28,7 +27,6 @@ void main(void)
}
[fragment shader]
-#version 120
void main(void)
{
gl_FragColor = vec4(1, 1, 1, 1);
diff --git a/tests/spec/glsl-1.20/execution/fs-assign-varied-struct.shader_test b/tests/spec/glsl-1.20/execution/fs-assign-varied-struct.shader_test
index ce40040..98a6290 100644
--- a/tests/spec/glsl-1.20/execution/fs-assign-varied-struct.shader_test
+++ b/tests/spec/glsl-1.20/execution/fs-assign-varied-struct.shader_test
@@ -5,14 +5,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
float x = 3.0;
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxClipPlanes.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxClipPlanes.shader_test
index 1667293..675cdc4 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxClipPlanes.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxClipPlanes.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxClipPlanes >= 6)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
index a489be0..acaae52 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxCombinedTextureImageUnits.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxCombinedTextureImageUnits >= 2)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxDrawBuffers.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxDrawBuffers.shader_test
index e450a1c..0b4b83d 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxDrawBuffers.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxDrawBuffers.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxDrawBuffers >= 1)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxFragmentUniformComponents.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
index 3aefbf5..a694c27 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxFragmentUniformComponents.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxFragmentUniformComponents >= 64)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxLights.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxLights.shader_test
index 3c0fea5..a9307be 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxLights.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxLights.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxLights >= 8)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureCoords.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureCoords.shader_test
index 4951ffd..8f2182f 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureCoords.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureCoords.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxTextureCoords >= 2)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureImageUnits.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureImageUnits.shader_test
index e32faae..a95d162 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureImageUnits.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureImageUnits.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxTextureImageUnits >= 2)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureUnits.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureUnits.shader_test
index 52bb5f6..399cc2b 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureUnits.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxTextureUnits.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxTextureUnits >= 2)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVaryingFloats.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVaryingFloats.shader_test
index 2116faa..7539f3d 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVaryingFloats.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVaryingFloats.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxVaryingFloats >= 32)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexAttribs.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexAttribs.shader_test
index 531fe71..8bc5a6a 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexAttribs.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexAttribs.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxVertexAttribs >= 16)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
index 38fa647..5fdd5f0 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexTextureImageUnits.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxVertexTextureImageUnits >= 0)
diff --git a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexUniformComponents.shader_test b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexUniformComponents.shader_test
index ae3b729..c2bc77f 100644
--- a/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexUniformComponents.shader_test
+++ b/tests/spec/glsl-1.20/execution/maximums/gl_MaxVertexUniformComponents.shader_test
@@ -7,14 +7,12 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
gl_Position = gl_Vertex;
}
[fragment shader]
-#version 120
void main(void)
{
if (gl_MaxVertexUniformComponents >= 512)
diff --git a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-int-float-to-float-float-float-return.shader_test b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-int-float-to-float-float-float-return.shader_test
index 15743c5..1b98d4c 100644
--- a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-int-float-to-float-float-float-return.shader_test
+++ b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-int-float-to-float-float-float-return.shader_test
@@ -16,7 +16,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
float f(out int x, out int y, out float z)
{
x = 4;
diff --git a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float-return.shader_test b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float-return.shader_test
index cf7f2b9..b642296 100644
--- a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float-return.shader_test
+++ b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float-return.shader_test
@@ -15,7 +15,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
float f(out int x)
{
x = 4;
diff --git a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float.shader_test b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float.shader_test
index 2c3a2ce..6d68c23 100644
--- a/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float.shader_test
+++ b/tests/spec/glsl-1.20/execution/qualifiers/vs-out-conversion-int-to-float.shader_test
@@ -15,7 +15,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void f(out int x)
{
x = 4;
diff --git a/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure-array.shader_test b/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure-array.shader_test
index 36f5644..e3f7587 100644
--- a/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure-array.shader_test
+++ b/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure-array.shader_test
@@ -2,7 +2,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main()
{
@@ -10,7 +9,6 @@ void main()
}
[fragment shader]
-#version 120
struct S {
int i;
diff --git a/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure.shader_test b/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure.shader_test
index 3b0c950..8944977 100644
--- a/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure.shader_test
+++ b/tests/spec/glsl-1.20/execution/uniform-initializer/fs-structure.shader_test
@@ -2,7 +2,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main()
{
@@ -10,7 +9,6 @@ void main()
}
[fragment shader]
-#version 120
varying vec4 color;
struct S {
diff --git a/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure-array.shader_test b/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure-array.shader_test
index 7b8bd50..c1746d8 100644
--- a/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure-array.shader_test
+++ b/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure-array.shader_test
@@ -2,7 +2,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
struct S {
int i;
@@ -35,7 +34,6 @@ void main()
}
[fragment shader]
-#version 120
varying vec4 color;
void main()
diff --git a/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure.shader_test b/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure.shader_test
index f2fa32d..1b79aad 100644
--- a/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure.shader_test
+++ b/tests/spec/glsl-1.20/execution/uniform-initializer/vs-structure.shader_test
@@ -2,7 +2,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
struct S {
int i;
@@ -29,7 +28,6 @@ void main()
}
[fragment shader]
-#version 120
varying vec4 color;
void main()
diff --git a/tests/spec/glsl-1.20/execution/vs-all-equal-bool-array.shader_test b/tests/spec/glsl-1.20/execution/vs-all-equal-bool-array.shader_test
index 376534b..7afbec1 100644
--- a/tests/spec/glsl-1.20/execution/vs-all-equal-bool-array.shader_test
+++ b/tests/spec/glsl-1.20/execution/vs-all-equal-bool-array.shader_test
@@ -2,7 +2,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
varying vec4 color;
uniform bool[2] ub = bool[2](bool(0), bool(1));
@@ -19,7 +18,6 @@ void main()
}
[fragment shader]
-#version 120
varying vec4 color;
void main()
diff --git a/tests/spec/glsl-1.20/execution/vs-assign-varied-struct.shader_test b/tests/spec/glsl-1.20/execution/vs-assign-varied-struct.shader_test
index d7f306f..80316c9 100644
--- a/tests/spec/glsl-1.20/execution/vs-assign-varied-struct.shader_test
+++ b/tests/spec/glsl-1.20/execution/vs-assign-varied-struct.shader_test
@@ -8,7 +8,6 @@
GLSL >= 1.20
[vertex shader]
-#version 120
void main(void)
{
float x = 3.0;
--
1.7.9.5
More information about the Piglit
mailing list