[Piglit] [PATCH] fix some require blocks for shaderdb runner

Samuel Pitoiset samuel.pitoiset at gmail.com
Sun Oct 2 14:22:08 UTC 2016


shaderdb runner is really less robust than shader_runner, it
actually expects to find 'GLSL >= x.y' in the first line and
it fails at parsing comments.

The best solution should be to improve shaderdb runner, but
fixing those require blocks also improve consistency.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 tests/shaders/glsl-fs-implicit-array-size-01.shader_test                | 2 +-
 tests/shaders/glsl-fs-implicit-array-size-02.shader_test                | 2 +-
 tests/shaders/glsl-fs-implicit-array-size-03.shader_test                | 2 +-
 tests/shaders/glsl-fs-post-increment-01.shader_test                     | 2 +-
 tests/shaders/glsl-vs-post-increment-01.shader_test                     | 2 +-
 tests/spec/arb_draw_instanced/execution/draw-non-instanced.shader_test  | 2 +-
 .../arb_draw_instanced/execution/instance-array-dereference.shader_test | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/shaders/glsl-fs-implicit-array-size-01.shader_test b/tests/shaders/glsl-fs-implicit-array-size-01.shader_test
index ffa9372..3ba3d8f 100644
--- a/tests/shaders/glsl-fs-implicit-array-size-01.shader_test
+++ b/tests/shaders/glsl-fs-implicit-array-size-01.shader_test
@@ -1,5 +1,5 @@
-[require]
 # This test reproduces Mesa bugzilla #33219.
+[require]
 GLSL >= 1.10
 
 [fragment shader]
diff --git a/tests/shaders/glsl-fs-implicit-array-size-02.shader_test b/tests/shaders/glsl-fs-implicit-array-size-02.shader_test
index 74f5bfb..7322b02 100644
--- a/tests/shaders/glsl-fs-implicit-array-size-02.shader_test
+++ b/tests/shaders/glsl-fs-implicit-array-size-02.shader_test
@@ -1,5 +1,5 @@
-[require]
 # This test reproduces Mesa bugzilla #33219.
+[require]
 GLSL >= 1.10
 
 [fragment shader]
diff --git a/tests/shaders/glsl-fs-implicit-array-size-03.shader_test b/tests/shaders/glsl-fs-implicit-array-size-03.shader_test
index 4141afa..cf00062 100644
--- a/tests/shaders/glsl-fs-implicit-array-size-03.shader_test
+++ b/tests/shaders/glsl-fs-implicit-array-size-03.shader_test
@@ -1,5 +1,5 @@
-[require]
 # This test reproduces Mesa bugzilla #34198.
+[require]
 GLSL >= 1.20
 
 [fragment shader]
diff --git a/tests/shaders/glsl-fs-post-increment-01.shader_test b/tests/shaders/glsl-fs-post-increment-01.shader_test
index 0748787..844a483 100644
--- a/tests/shaders/glsl-fs-post-increment-01.shader_test
+++ b/tests/shaders/glsl-fs-post-increment-01.shader_test
@@ -1,6 +1,6 @@
-[require]
 # Once gl_Vertex is changed to piglit_vertex, this test will work with
 # GLSL ES 1.00 as well.
+[require]
 GLSL >= 1.10
 
 [vertex shader]
diff --git a/tests/shaders/glsl-vs-post-increment-01.shader_test b/tests/shaders/glsl-vs-post-increment-01.shader_test
index 82203c6..5752345 100644
--- a/tests/shaders/glsl-vs-post-increment-01.shader_test
+++ b/tests/shaders/glsl-vs-post-increment-01.shader_test
@@ -1,6 +1,6 @@
-[require]
 # Once gl_Vertex is changed to piglit_vertex, this test will work with
 # GLSL ES 1.00 as well.
+[require]
 GLSL >= 1.10
 
 [vertex shader]
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 357fe28..a658cf6 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,6 +1,6 @@
 [require]
-GL_ARB_draw_instanced
 GLSL >= 1.10
+GL_ARB_draw_instanced
 
 [vertex shader]
 /* Verify that InstanceID is zero when drawing primitives using a
diff --git a/tests/spec/arb_draw_instanced/execution/instance-array-dereference.shader_test b/tests/spec/arb_draw_instanced/execution/instance-array-dereference.shader_test
index f88f62a..9eddc87 100644
--- a/tests/spec/arb_draw_instanced/execution/instance-array-dereference.shader_test
+++ b/tests/spec/arb_draw_instanced/execution/instance-array-dereference.shader_test
@@ -1,6 +1,6 @@
 [require]
-GL_ARB_draw_instanced
 GLSL >= 1.20
+GL_ARB_draw_instanced
 
 [vertex shader]
 #version 120
-- 
2.10.0



More information about the Piglit mailing list