summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-06-18 21:50:04 -0700
committerKenneth Graunke <kenneth@whitecape.org>2015-06-18 22:16:23 -0700
commit290d5824fb9f231379beaf3b3aa772375be3eb42 (patch)
treed9431bc43c482e00e3a8fc6e38e052556fd079b1
parent209fa9c972eb7b4d2c077a50777ef816ddc398cf (diff)
Port fp-cmp.vpfp to shader_runner
This commit was autogenerated by Python and Bash scripting.
-rw-r--r--tests/all.py1
-rw-r--r--tests/shaders/generic/fp-cmp.vpfp11
-rw-r--r--tests/spec/arb_fragment_program/fp-cmp.shader_test22
3 files changed, 22 insertions, 12 deletions
diff --git a/tests/all.py b/tests/all.py
index d27253db8..9a80f8328 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1905,7 +1905,6 @@ with profile.group_manager(
g(['trinity-fp1'], run_concurrent=False)
g(['arb_fragment_program-sparse-samplers'], 'sparse-samplers')
g(['incomplete-texture', 'arb_fp'], 'incomplete-texture-arb_fp')
- add_vpfpgeneric(g, 'fp-cmp')
add_vpfpgeneric(g, 'fp-dst-aliasing-1')
add_vpfpgeneric(g, 'fp-dst-aliasing-2')
add_vpfpgeneric(g, 'fp-ex2-sat')
diff --git a/tests/shaders/generic/fp-cmp.vpfp b/tests/shaders/generic/fp-cmp.vpfp
deleted file mode 100644
index e7b559a33..000000000
--- a/tests/shaders/generic/fp-cmp.vpfp
+++ /dev/null
@@ -1,11 +0,0 @@
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-CMP result.color, {-1, -1, 0, 1}, {0, 1, 1, 0}, {0, 0, 0, 1};
-END
-
-!!test
-expected 0.0 1.0 0.0 1.0
-
diff --git a/tests/spec/arb_fragment_program/fp-cmp.shader_test b/tests/spec/arb_fragment_program/fp-cmp.shader_test
new file mode 100644
index 000000000..ef268c6e4
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fp-cmp.shader_test
@@ -0,0 +1,22 @@
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+CMP result.color, {-1, -1, 0, 1}, {0, 1, 1, 0}, {0, 0, 0, 1};
+END
+
+[test]
+ortho 0 1 0 1
+clear color 1.0 0.0 1.0 0.0
+clear
+draw rect 0 0 1 1
+probe all rgba 0.0 1.0 0.0 1.0
+