[Piglit] [PATCH 15/40] Port fp-cmp.vpfp to shader_runner

[Kenneth Graunke]

This commit was autogenerated by Python and Bash scripting.
---
 tests/all.py                                       |  1 -
 tests/shaders/generic/fp-cmp.vpfp                  | 11 -----------
 tests/spec/arb_fragment_program/fp-cmp.shader_test | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 tests/shaders/generic/fp-cmp.vpfp
 create mode 100644 tests/spec/arb_fragment_program/fp-cmp.shader_test

diff --git a/tests/all.py b/tests/all.py
index a4d6599..c96dfd2 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1903,7 +1903,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 e7b559a..0000000
--- 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 0000000..741aaff
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fp-cmp.shader_test
@@ -0,0 +1,20 @@
+[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
+draw rect 0 0 1 1
+probe all rgba  0.0 1.0 0.0 1.0
+
-- 
2.4.2