[Piglit] [PATCH 08/40] Port fdo30337b.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index 759d31e..b973353 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, 'fdo30337b')
     add_vpfpgeneric(g, 'fdo38145')
     add_vpfpgeneric(g, 'fp-cmp')
     add_vpfpgeneric(g, 'fp-dst-aliasing-1')
diff --git a/tests/shaders/generic/fdo30337b.vpfp b/tests/shaders/generic/fdo30337b.vpfp
deleted file mode 100644
index e6809fc..0000000
--- a/tests/shaders/generic/fdo30337b.vpfp
+++ /dev/null
@@ -1,25 +0,0 @@
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-#This test is for instructions that read from more components than the
-#presubtract operation writes.  For example:
-#ADD Temp[0].x Temp[1].x, Temp[2].x
-#MUL Temp[4]x. Temp[0].x, Temp[5].x
-#DP3 Temp[6].x Temp[0].xyz, Temp[0].xyz
-#The ADD instruction can be converted to a presubtract operation and be
-#used by the MUL instruction, but it cannot be used by the DP3 instruction
-#since that instruction reads from more than just the x component of Temp[0].
-#Therefore the ADD instruction should not be removed.
-TEMP color;
-MOV color, {0.1, 0.4, 0.8, 1.0};
-SUB color.x, color.x, color.x;
-ADD color.y, color.x, color.y;
-SUB color.z, color.x, color.x;
-DP3 color.w, color, color;
-MOV result.color, color;
-END
-
-!!test
-expected          0.0     0.4      0.0      0.16
diff --git a/tests/spec/arb_fragment_program/fdo30337b.shader_test b/tests/spec/arb_fragment_program/fdo30337b.shader_test
new file mode 100644
index 0000000..daa5af2
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fdo30337b.shader_test
@@ -0,0 +1,35 @@
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+#This test is for instructions that read from more components than the
+#presubtract operation writes.  For example:
+#ADD Temp[0].x Temp[1].x, Temp[2].x
+#MUL Temp[4]x. Temp[0].x, Temp[5].x
+#DP3 Temp[6].x Temp[0].xyz, Temp[0].xyz
+#The ADD instruction can be converted to a presubtract operation and be
+#used by the MUL instruction, but it cannot be used by the DP3 instruction
+#since that instruction reads from more than just the x component of Temp[0].
+#Therefore the ADD instruction should not be removed.
+TEMP color;
+MOV color, {0.1, 0.4, 0.8, 1.0};
+SUB color.x, color.x, color.x;
+ADD color.y, color.x, color.y;
+SUB color.z, color.x, color.x;
+DP3 color.w, color, color;
+MOV result.color, color;
+END
+
+[test]
+ortho 0 1 0 1
+draw rect 0 0 1 1
+probe all rgba  0.0 0.4 0.0 0.16
+
-- 
2.4.2