[Piglit] [PATCH 3/3] Add "clear" commands to clipping shader_tests.
Paul Berry
stereotype441 at gmail.com
Mon Oct 3 16:19:04 PDT 2011
Several of the *.shader_test files for testing clipping do not
necessarily draw to all pixels in the piglit window. This patch adds
appropriate "clear" commands to those tests, so that they don't
produce sporadic failures on platforms where the window doesn't start
out black.
---
.../vs-clip-vertex-const-accept.shader_test | 2 ++
.../vs-clip-vertex-const-reject.shader_test | 2 ++
...clip-vertex-different-from-position.shader_test | 2 ++
.../vs-clip-vertex-equal-to-position.shader_test | 2 ++
.../vs-clip-vertex-homogeneity.shader_test | 2 ++
...-clip-based-on-position-homogeneity.shader_test | 2 ++
.../clipping/vs-clip-based-on-position.shader_test | 2 ++
...vs-clip-distance-all-planes-enabled.shader_test | 2 ++
.../vs-clip-distance-bulk-assign.shader_test | 2 ++
.../vs-clip-distance-const-accept.shader_test | 2 ++
.../vs-clip-distance-const-reject.shader_test | 2 ++
.../vs-clip-distance-implicitly-sized.shader_test | 2 ++
.../clipping/vs-clip-distance-in-param.shader_test | 2 ++
.../vs-clip-distance-inout-param.shader_test | 2 ++
.../vs-clip-distance-out-param.shader_test | 2 ++
.../clipping/vs-clip-distance-retval.shader_test | 2 ++
.../vs-clip-distance-uint-index.shader_test | 2 ++
17 files changed, 34 insertions(+), 0 deletions(-)
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 4f4bde5..6c2b56c 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
@@ -34,6 +34,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
clip plane 0 1.0 0.0 0.0 0.0 # accept points where gl_ClipVertex.x >= 0
enable GL_CLIP_PLANE0
draw rect -1 -1 2 2
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 4491bd9..0bb08ea 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
@@ -34,6 +34,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
clip plane 0 1.0 0.0 0.0 0.0 # accept points where gl_ClipVertex.x >= 0
enable GL_CLIP_PLANE0
draw rect -1 -1 2 2
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 ae1440d..c7dae89 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
@@ -28,6 +28,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
clip plane 0 0 1 0 -2.5
clip plane 1 -1 1 0 4
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 773936b..50b4856 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
@@ -23,6 +23,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
clip plane 0 0 1 0 0.5
clip plane 1 -1 1 0 0.8
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 03e8d73..615ecf9 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
@@ -35,6 +35,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
clip plane 0 0 1 0 -2.5
clip plane 1 -1 1 0 4
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position-homogeneity.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position-homogeneity.shader_test
index ce16956..7d1bae8 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position-homogeneity.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position-homogeneity.shader_test
@@ -33,6 +33,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
clip plane 0 0 1 0 0.5
clip plane 1 -1 1 0 0.8
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position.shader_test
index d01cae4..27a6318 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-based-on-position.shader_test
@@ -30,6 +30,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
clip plane 0 0 1 0 0.5
clip plane 1 -1 1 0 0.8
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-all-planes-enabled.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-all-planes-enabled.shader_test
index 88f37ec..37a8216 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-all-planes-enabled.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-all-planes-enabled.shader_test
@@ -40,6 +40,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-bulk-assign.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-bulk-assign.shader_test
index 621f577..7c921d5 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-bulk-assign.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-bulk-assign.shader_test
@@ -70,6 +70,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-accept.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-accept.shader_test
index 83402ec..354359d 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-accept.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-accept.shader_test
@@ -33,6 +33,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
enable GL_CLIP_PLANE0
draw rect -1 -1 2 2
probe all rgba 1.0 1.0 1.0 1.0
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-reject.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-reject.shader_test
index 44c3113..059589a 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-reject.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-const-reject.shader_test
@@ -33,6 +33,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
enable GL_CLIP_PLANE0
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 0.0
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-implicitly-sized.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-implicitly-sized.shader_test
index 5eee867..f8f61a3 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-implicitly-sized.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-implicitly-sized.shader_test
@@ -52,6 +52,8 @@ void main()
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-in-param.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-in-param.shader_test
index 070e971..bbafc29 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-in-param.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-in-param.shader_test
@@ -63,6 +63,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-inout-param.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-inout-param.shader_test
index dd62b06..075069d 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-inout-param.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-inout-param.shader_test
@@ -72,6 +72,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-out-param.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-out-param.shader_test
index 050b374..fcc4737 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-out-param.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-out-param.shader_test
@@ -71,6 +71,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-retval.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-retval.shader_test
index ee34854..3dc8dc0 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-retval.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-retval.shader_test
@@ -97,6 +97,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
diff --git a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-uint-index.shader_test b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-uint-index.shader_test
index 9cdc788..93f0fc2 100644
--- a/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-uint-index.shader_test
+++ b/tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-uint-index.shader_test
@@ -46,6 +46,8 @@ void main(void)
}
[test]
+clear color 0.0 0.0 0.0 0.0
+clear
ortho 0 1 0 1
enable GL_CLIP_PLANE0
enable GL_CLIP_PLANE1
--
1.7.6.2
More information about the Piglit
mailing list