[Piglit] [PATCH 06/40] Port dataflow-bug.vpfp to shader_runner

[Kenneth Graunke]

This commit was autogenerated by Python and Bash scripting.
---
 tests/all.py                                       |  1 -
 tests/shaders/generic/dataflow-bug.vpfp            | 36 -----------------
 .../arb_vertex_program/dataflow-bug.shader_test    | 45 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 37 deletions(-)
 delete mode 100644 tests/shaders/generic/dataflow-bug.vpfp
 create mode 100644 tests/spec/arb_vertex_program/dataflow-bug.shader_test

diff --git a/tests/all.py b/tests/all.py
index c9fc2d5..3ad8c22 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2606,7 +2606,6 @@ with profile.group_manager(
     g(['vp-address-04'], run_concurrent=False)
     g(['vp-bad-program'], run_concurrent=False)
     g(['vp-max-array'], run_concurrent=False)
-    add_vpfpgeneric(g, 'dataflow-bug')
     add_vpfpgeneric(g, 'fogcoord-dp3')
     add_vpfpgeneric(g, 'fogcoord-dph')
     add_vpfpgeneric(g, 'fogcoord-dp4')
diff --git a/tests/shaders/generic/dataflow-bug.vpfp b/tests/shaders/generic/dataflow-bug.vpfp
deleted file mode 100644
index b76e90f..0000000
--- a/tests/shaders/generic/dataflow-bug.vpfp
+++ /dev/null
@@ -1,36 +0,0 @@
-; Test against a dataflow analysis bug that appeared in the R300 program
-; compiler.
-;
-; Note the redundant MOV before the first MAD. This is intended, and part
-; of what triggered the (admittedly somewhat subtle) bug.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-
-TEMP tx, ty, tz, t;
-TEMP tweight;
-
-MOV tweight, vertex.texcoord[0];
-MUL tx, tweight.x, program.local[0];
-MUL ty, tweight.x, program.local[1];
-
-MOV t, program.local[2];
-MAD tx, tweight.y, program.local[2], tx;
-MOV t, program.local[3];
-MAD ty, tweight.y, t, ty;
-
-ADD result.color, tx, ty;
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-texcoord[0]  -1 2 0 0
-
-vertex.local[0]   0       0.5     -1.3      0.1
-vertex.local[1]  -0.3     0        0.4     -0.5
-vertex.local[2]   0.2     0.3      0        0.2
-vertex.local[3]  -0.1     0.1     -0.1      0
-expected          0.5     0.3      0.7      0.8
diff --git a/tests/spec/arb_vertex_program/dataflow-bug.shader_test b/tests/spec/arb_vertex_program/dataflow-bug.shader_test
new file mode 100644
index 0000000..d4ed053
--- /dev/null
+++ b/tests/spec/arb_vertex_program/dataflow-bug.shader_test
@@ -0,0 +1,45 @@
+# Test against a dataflow analysis bug that appeared in the R300 program
+# compiler.
+#
+# Note the redundant MOV before the first MAD. This is intended, and part
+# of what triggered the (admittedly somewhat subtle) bug.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+
+TEMP tx, ty, tz, t;
+TEMP tweight;
+
+MOV tweight, vertex.texcoord[0];
+MUL tx, tweight.x, program.local[0];
+MUL ty, tweight.x, program.local[1];
+
+MOV t, program.local[2];
+MAD tx, tweight.y, program.local[2], tx;
+MOV t, program.local[3];
+MAD ty, tweight.y, t, ty;
+
+ADD result.color, tx, ty;
+END
+
+[fragment program]
+!!ARBfp1.0
+MOV result.color, fragment.color;
+END
+
+[test]
+ortho 0 1 0 1
+texcoord 0 (-1, 2, 0, 0)
+parameter local_vp 0 (0, 0.5, -1.3, 0.1)
+parameter local_vp 1 (-0.3, 0, 0.4, -0.5)
+parameter local_vp 2 (0.2, 0.3, 0, 0.2)
+parameter local_vp 3 (-0.1, 0.1, -0.1, 0)
+draw rect 0 0 1 1
+probe all rgba  0.5 0.3 0.7 0.8
+
-- 
2.4.2