[Piglit] [PATCH 19/40] Port fp-two-constants.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index 6c06325..9a8865e 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-two-constants')
 
 with profile.group_manager(
         PiglitGLTest,
diff --git a/tests/shaders/generic/fp-two-constants.vpfp b/tests/shaders/generic/fp-two-constants.vpfp
deleted file mode 100644
index 2305bad..0000000
--- a/tests/shaders/generic/fp-two-constants.vpfp
+++ /dev/null
@@ -1,17 +0,0 @@
-; Detects whether or not the implementation correctly handles having two
-; constants in the same operand.
-;
-; This is a potential issue with gen4, and is something we should probably
-; make the optimizer handle.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-ADD result.color, {1, 0, .25, 0}, {0.5, 0, 1, 0};
-END
-
-!!test
-expected          1.0     0.0      1.0      0.0
-
diff --git a/tests/spec/arb_fragment_program/fp-two-constants.shader_test b/tests/spec/arb_fragment_program/fp-two-constants.shader_test
new file mode 100644
index 0000000..b70f7db
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fp-two-constants.shader_test
@@ -0,0 +1,26 @@
+# Detects whether or not the implementation correctly handles having two
+# constants in the same operand.
+#
+# This is a potential issue with gen4, and is something we should probably
+# make the optimizer handle.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+ADD result.color, {1, 0, .25, 0}, {0.5, 0, 1, 0};
+END
+
+[test]
+ortho 0 1 0 1
+draw rect 0 0 1 1
+probe all rgba  1.0 0.0 1.0 0.0
+
-- 
2.4.2