[Piglit] [PATCH 17/40] Port fp-dst-aliasing-2.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index 7742d4a..0979d17 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-dst-aliasing-2')
     add_vpfpgeneric(g, 'fp-ex2-sat')
     add_vpfpgeneric(g, 'fp-two-constants')
 
diff --git a/tests/shaders/generic/fp-dst-aliasing-2.vpfp b/tests/shaders/generic/fp-dst-aliasing-2.vpfp
deleted file mode 100644
index e757cd6..0000000
--- a/tests/shaders/generic/fp-dst-aliasing-2.vpfp
+++ /dev/null
@@ -1,16 +0,0 @@
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-TEMP temp;
-MOV temp, program.local[1];
-DST temp, program.local[0], temp.xyzy;
-MOV result.color, temp;
-END
-
-!!test
-fragment.local[0] 0.1 0.2 0.3 0.4
-fragment.local[1] 0.5 0.5 0.5 0.5
-expected          1.0 0.1 0.3 0.5
-
diff --git a/tests/spec/arb_fragment_program/fp-dst-aliasing-2.shader_test b/tests/spec/arb_fragment_program/fp-dst-aliasing-2.shader_test
new file mode 100644
index 0000000..05d5e07
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fp-dst-aliasing-2.shader_test
@@ -0,0 +1,25 @@
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+TEMP temp;
+MOV temp, program.local[1];
+DST temp, program.local[0], temp.xyzy;
+MOV result.color, temp;
+END
+
+[test]
+ortho 0 1 0 1
+parameter local_fp 0 (0.1, 0.2, 0.3, 0.4)
+parameter local_fp 1 (0.5, 0.5, 0.5, 0.5)
+draw rect 0 0 1 1
+probe all rgba  1.0 0.1 0.3 0.5
+
-- 
2.4.2