[Piglit] [PATCH 07/40] Port fdo30337a.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index 3ad8c22..759d31e 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, 'fdo30337a')
     add_vpfpgeneric(g, 'fdo30337b')
     add_vpfpgeneric(g, 'fdo38145')
     add_vpfpgeneric(g, 'fp-cmp')
diff --git a/tests/shaders/generic/fdo30337a.vpfp b/tests/shaders/generic/fdo30337a.vpfp
deleted file mode 100644
index 48b97d7..0000000
--- a/tests/shaders/generic/fdo30337a.vpfp
+++ /dev/null
@@ -1,17 +0,0 @@
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-#This tests instructions like: ADD Temp[0], Temp[0], Temp[1] where one of
-#the source registers is the same as the destination register.  These
-#should not be replaced with presubtract operations.
-TEMP color;
-MOV color, {0.1, 0.4, 0.8, 1.0};
-ADD color.x, color.x, color.x;
-ADD color.y, color.x, color.y;
-MOV result.color, color;
-END
-
-!!test
-expected          0.2     0.6      0.8      1.0
diff --git a/tests/spec/arb_fragment_program/fdo30337a.shader_test b/tests/spec/arb_fragment_program/fdo30337a.shader_test
new file mode 100644
index 0000000..49e9619
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fdo30337a.shader_test
@@ -0,0 +1,27 @@
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+#This tests instructions like: ADD Temp[0], Temp[0], Temp[1] where one of
+#the source registers is the same as the destination register.  These
+#should not be replaced with presubtract operations.
+TEMP color;
+MOV color, {0.1, 0.4, 0.8, 1.0};
+ADD color.x, color.x, color.x;
+ADD color.y, color.x, color.y;
+MOV result.color, color;
+END
+
+[test]
+ortho 0 1 0 1
+draw rect 0 0 1 1
+probe all rgba  0.2 0.6 0.8 1.0
+
-- 
2.4.2