[Piglit] [PATCH 1/4] gen_equal_tests: Update generator to match in-tree tests.
Kenneth Graunke
kenneth at whitecape.org
Sat May 17 01:58:35 PDT 2014
Ian removed the GL >= 2.0 requirement in commit
38017752bca481d312de69cba5e334fd8c732a14.
Matt removed the #version 120 lines in commit
67174fbcf797b4a129250db1a3c001974e7522ad.
Matt dropped ortho/clear in commit:
2e5614458e566fb4353e92fc0b6407c12ee45c87
Now running gen_equal_tests.py produces equivalent results to the
committed tests.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
tests/shaders/gen_equal_tests.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
I found another Python test generator in the tree that wasn't hooked up.
So I went and fixed that.
diff --git a/tests/shaders/gen_equal_tests.py b/tests/shaders/gen_equal_tests.py
index af730bc..2173e8e 100644
--- a/tests/shaders/gen_equal_tests.py
+++ b/tests/shaders/gen_equal_tests.py
@@ -10,14 +10,12 @@ def emit_test(f, func, input1, input2, expected):
test = """
[require]
-GL >= 2.0
GLSL >= 1.20
[vertex shader file]
glsl-mvp.vert
[fragment shader]
-#version 120
void main()
{
const %s res = %s(%s,
@@ -27,11 +25,8 @@ void main()
}
[test]
-clear color 0.0 0.0 0.0 0.0
-clear
-ortho
-draw rect 10 10 10 10
-probe rgb 15 15 0.0 1.0 0.0
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0
""" % (s[0], func, input1, spaces, input2, expected)
f.write(test)
--
1.9.2
More information about the Piglit
mailing list