[Piglit] [PATCH 2/3] Add [require] / GLSL >= to shader_test files missing these.
Stuart Abercrombie
sabercrombie at chromium.org
Thu Jan 31 10:17:24 PST 2013
The intention is for this to be mandatory for all shader_test files.
Signed-off-by: Stuart Abercrombie <sabercrombie at chromium.org>
---
tests/shaders/glsl-fs-loop-break.shader_test | 1 +
tests/shaders/glsl-fs-loop-continue.shader_test | 1 +
tests/shaders/glsl-fs-neg-dot.shader_test | 1 +
tests/shaders/glsl-vs-loop-break.shader_test | 1 +
tests/shaders/glsl-vs-loop-continue.shader_test | 1 +
tests/shaders/link-struct-usage.shader_test | 1 +
.../execution/draw-non-instanced.shader_test | 1 +
.../fs-bool-less-compare-false.shader_test | 2 ++
.../fs-bool-less-compare-true.shader_test | 2 ++
.../execution/fs-inline-notequal.shader_test | 2 ++
.../execution/fs-loop-bounds-unrolled.shader_test | 3 +++
.../execution/fs-saturate-exp2.shader_test | 3 +++
.../execution/fs-saturate-pow.shader_test | 3 +++
.../execution/fs-saturate-sqrt.shader_test | 3 +++
...-vector-indexing-kills-all-channels.shader_test | 2 ++
.../execution/vs-inline-notequal.shader_test | 2 ++
.../execution/vs-loop-bounds-unrolled.shader_test | 2 ++
.../execution/vs-saturate-exp2.shader_test | 3 +++
.../execution/vs-saturate-pow.shader_test | 3 +++
.../execution/vs-saturate-sqrt.shader_test | 3 +++
...-vector-indexing-kills-all-channels.shader_test | 2 ++
...ltin-global-from-fn-unknown-to-main.shader_test | 2 ++
22 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/tests/shaders/glsl-fs-loop-break.shader_test b/tests/shaders/glsl-fs-loop-break.shader_test
index c30a5ec..c5766a2 100644
--- a/tests/shaders/glsl-fs-loop-break.shader_test
+++ b/tests/shaders/glsl-fs-loop-break.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/shaders/glsl-fs-loop-continue.shader_test b/tests/shaders/glsl-fs-loop-continue.shader_test
index cd9056a..2b53c69 100644
--- a/tests/shaders/glsl-fs-loop-continue.shader_test
+++ b/tests/shaders/glsl-fs-loop-continue.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/shaders/glsl-fs-neg-dot.shader_test b/tests/shaders/glsl-fs-neg-dot.shader_test
index 40dbb9d..ac02cf6 100644
--- a/tests/shaders/glsl-fs-neg-dot.shader_test
+++ b/tests/shaders/glsl-fs-neg-dot.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/shaders/glsl-vs-loop-break.shader_test b/tests/shaders/glsl-vs-loop-break.shader_test
index 0fddc74..cb8dbee 100644
--- a/tests/shaders/glsl-vs-loop-break.shader_test
+++ b/tests/shaders/glsl-vs-loop-break.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
varying vec4 color;
diff --git a/tests/shaders/glsl-vs-loop-continue.shader_test b/tests/shaders/glsl-vs-loop-continue.shader_test
index cf88a48..b78db62 100644
--- a/tests/shaders/glsl-vs-loop-continue.shader_test
+++ b/tests/shaders/glsl-vs-loop-continue.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
varying vec4 color;
diff --git a/tests/shaders/link-struct-usage.shader_test b/tests/shaders/link-struct-usage.shader_test
index 8c9fdf2..7bea0b0 100644
--- a/tests/shaders/link-struct-usage.shader_test
+++ b/tests/shaders/link-struct-usage.shader_test
@@ -1,4 +1,5 @@
[require]
+GLSL >= 1.10
[vertex shader]
varying vec4 color;
diff --git a/tests/spec/arb_draw_instanced/execution/draw-non-instanced.shader_test b/tests/spec/arb_draw_instanced/execution/draw-non-instanced.shader_test
index 1d9d7cc..357fe28 100644
--- a/tests/spec/arb_draw_instanced/execution/draw-non-instanced.shader_test
+++ b/tests/spec/arb_draw_instanced/execution/draw-non-instanced.shader_test
@@ -1,5 +1,6 @@
[require]
GL_ARB_draw_instanced
+GLSL >= 1.10
[vertex shader]
/* Verify that InstanceID is zero when drawing primitives using a
diff --git a/tests/spec/glsl-1.10/execution/fs-bool-less-compare-false.shader_test b/tests/spec/glsl-1.10/execution/fs-bool-less-compare-false.shader_test
index 11c572c..ead7a73 100644
--- a/tests/spec/glsl-1.10/execution/fs-bool-less-compare-false.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-bool-less-compare-false.shader_test
@@ -1,5 +1,7 @@
# This test exercises a bug introduced in i965: Comparison of comparison
# results to boolean values gave incorrect results.
+[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/spec/glsl-1.10/execution/fs-bool-less-compare-true.shader_test b/tests/spec/glsl-1.10/execution/fs-bool-less-compare-true.shader_test
index bc9148c..5aeb005 100644
--- a/tests/spec/glsl-1.10/execution/fs-bool-less-compare-true.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-bool-less-compare-true.shader_test
@@ -1,5 +1,7 @@
# This test exercises a bug introduced in i965: Comparison of comparison
# results to boolean values gave incorrect results.
+[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/spec/glsl-1.10/execution/fs-inline-notequal.shader_test b/tests/spec/glsl-1.10/execution/fs-inline-notequal.shader_test
index 6def318..2ccc927 100644
--- a/tests/spec/glsl-1.10/execution/fs-inline-notequal.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-inline-notequal.shader_test
@@ -1,6 +1,8 @@
# This test exercises a bug found in Mesa: if function inlining caused
# an execution of notEqual() to be constant-folded, an assertion
# failure would occur.
+[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/spec/glsl-1.10/execution/fs-loop-bounds-unrolled.shader_test b/tests/spec/glsl-1.10/execution/fs-loop-bounds-unrolled.shader_test
index 40fa6b7..e4621f3 100644
--- a/tests/spec/glsl-1.10/execution/fs-loop-bounds-unrolled.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-loop-bounds-unrolled.shader_test
@@ -1,6 +1,9 @@
# This test verifies that loop unrolling properly interprets a variety
# of ways of specifying loop bounds.
+[require]
+GLSL >= 1.10
+
[vertex shader]
void main()
{
diff --git a/tests/spec/glsl-1.10/execution/fs-saturate-exp2.shader_test b/tests/spec/glsl-1.10/execution/fs-saturate-exp2.shader_test
index fd5a26f..03c1f5e 100644
--- a/tests/spec/glsl-1.10/execution/fs-saturate-exp2.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-saturate-exp2.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
void main()
{
diff --git a/tests/spec/glsl-1.10/execution/fs-saturate-pow.shader_test b/tests/spec/glsl-1.10/execution/fs-saturate-pow.shader_test
index 78e2d5d..9e6778b 100644
--- a/tests/spec/glsl-1.10/execution/fs-saturate-pow.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-saturate-pow.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
void main()
{
diff --git a/tests/spec/glsl-1.10/execution/fs-saturate-sqrt.shader_test b/tests/spec/glsl-1.10/execution/fs-saturate-sqrt.shader_test
index 013e007..f901dbe 100644
--- a/tests/spec/glsl-1.10/execution/fs-saturate-sqrt.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-saturate-sqrt.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
void main()
{
diff --git a/tests/spec/glsl-1.10/execution/fs-vector-indexing-kills-all-channels.shader_test b/tests/spec/glsl-1.10/execution/fs-vector-indexing-kills-all-channels.shader_test
index b22405a..78a3731 100644
--- a/tests/spec/glsl-1.10/execution/fs-vector-indexing-kills-all-channels.shader_test
+++ b/tests/spec/glsl-1.10/execution/fs-vector-indexing-kills-all-channels.shader_test
@@ -1,6 +1,8 @@
# This test exercises a bug in mesa as of 5/19.12: constant
# propagation fails to detect that array indexing into a vector might
# kill any component of the vector.
+[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/spec/glsl-1.10/execution/vs-inline-notequal.shader_test b/tests/spec/glsl-1.10/execution/vs-inline-notequal.shader_test
index a2a0923..bfb74cc 100644
--- a/tests/spec/glsl-1.10/execution/vs-inline-notequal.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-inline-notequal.shader_test
@@ -1,6 +1,8 @@
# This test exercises a bug found in Mesa: if function inlining caused
# an execution of notEqual() to be constant-folded, an assertion
# failure would occur.
+[require]
+GLSL >= 1.10
[vertex shader]
bvec4 foo(vec4 x, vec4 y)
diff --git a/tests/spec/glsl-1.10/execution/vs-loop-bounds-unrolled.shader_test b/tests/spec/glsl-1.10/execution/vs-loop-bounds-unrolled.shader_test
index c9d47f3..026027f 100644
--- a/tests/spec/glsl-1.10/execution/vs-loop-bounds-unrolled.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-loop-bounds-unrolled.shader_test
@@ -1,5 +1,7 @@
# This test contains a variety of loops that are likely to be unrolled
# by the implementation, and verifies that they all execute correctly.
+[require]
+GLSL >= 1.10
[vertex shader]
void main()
diff --git a/tests/spec/glsl-1.10/execution/vs-saturate-exp2.shader_test b/tests/spec/glsl-1.10/execution/vs-saturate-exp2.shader_test
index de25327..45e0bb7 100644
--- a/tests/spec/glsl-1.10/execution/vs-saturate-exp2.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-saturate-exp2.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
uniform vec4 v;
varying vec4 color;
diff --git a/tests/spec/glsl-1.10/execution/vs-saturate-pow.shader_test b/tests/spec/glsl-1.10/execution/vs-saturate-pow.shader_test
index 72decdc..95dbd57 100644
--- a/tests/spec/glsl-1.10/execution/vs-saturate-pow.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-saturate-pow.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
uniform vec4 x;
uniform vec4 y;
diff --git a/tests/spec/glsl-1.10/execution/vs-saturate-sqrt.shader_test b/tests/spec/glsl-1.10/execution/vs-saturate-sqrt.shader_test
index 13fd7ae..c10df0f 100644
--- a/tests/spec/glsl-1.10/execution/vs-saturate-sqrt.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-saturate-sqrt.shader_test
@@ -1,3 +1,6 @@
+[require]
+GLSL >= 1.10
+
[vertex shader]
uniform vec4 v;
varying vec4 color;
diff --git a/tests/spec/glsl-1.10/execution/vs-vector-indexing-kills-all-channels.shader_test b/tests/spec/glsl-1.10/execution/vs-vector-indexing-kills-all-channels.shader_test
index 6838f78..aee81bb 100644
--- a/tests/spec/glsl-1.10/execution/vs-vector-indexing-kills-all-channels.shader_test
+++ b/tests/spec/glsl-1.10/execution/vs-vector-indexing-kills-all-channels.shader_test
@@ -1,6 +1,8 @@
# This test exercises a bug in mesa as of 5/19/12: constant
# propagation fails to detect that array indexing into a vector might
# kill any component of the vector.
+[require]
+GLSL >= 1.10
[vertex shader]
#define RED vec4(1.0, 0.0, 0.0, 0.0)
diff --git a/tests/spec/glsl-1.10/linker/access-builtin-global-from-fn-unknown-to-main.shader_test b/tests/spec/glsl-1.10/linker/access-builtin-global-from-fn-unknown-to-main.shader_test
index 09687a2..859f918 100644
--- a/tests/spec/glsl-1.10/linker/access-builtin-global-from-fn-unknown-to-main.shader_test
+++ b/tests/spec/glsl-1.10/linker/access-builtin-global-from-fn-unknown-to-main.shader_test
@@ -1,6 +1,8 @@
# Test that GLSL built-in global variables can be accessed from a
# function that is neither defined nor declared in the compilation
# unit that defines main().
+[require]
+GLSL >= 1.10
[vertex shader]
void f();
--
1.7.5.4
More information about the Piglit
mailing list