[Piglit] [PATCH 11/40] Port fogcoord-dp4.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index 37475b1..2b9777b 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2604,7 +2604,6 @@ with profile.group_manager(
     g(['vp-bad-program'], run_concurrent=False)
     g(['vp-max-array'], run_concurrent=False)
     add_vpfpgeneric(g, 'fogcoord-dph')
-    add_vpfpgeneric(g, 'fogcoord-dp4')
     add_vpfpgeneric(g, 'vp-arl-constant-array')
     add_vpfpgeneric(g, 'vp-arl-constant-array-huge')
     add_vpfpgeneric(g, 'vp-arl-constant-array-huge-varying')
diff --git a/tests/shaders/generic/fogcoord-dp4.vpfp b/tests/shaders/generic/fogcoord-dp4.vpfp
deleted file mode 100644
index d665a3a..0000000
--- a/tests/shaders/generic/fogcoord-dp4.vpfp
+++ /dev/null
@@ -1,17 +0,0 @@
-; Tests whether the special fogcoord varying is treated correctly in
-; the face of an instruction that has no straight-forward mapping of
-; input components to output components.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-DP4 result.fogcoord, vertex.texcoord[0], vertex.texcoord[1];
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.fogcoord;
-END
-
-!!test
-texcoord[0] 0.4 -0.3 0.1 0.5
-texcoord[1] -1 1 8 0.5
-expected 0.35 0 0 1
diff --git a/tests/spec/arb_vertex_program/fogcoord-dp4.shader_test b/tests/spec/arb_vertex_program/fogcoord-dp4.shader_test
new file mode 100644
index 0000000..b19b1d8
--- /dev/null
+++ b/tests/spec/arb_vertex_program/fogcoord-dp4.shader_test
@@ -0,0 +1,27 @@
+# Tests whether the special fogcoord varying is treated correctly in
+# the face of an instruction that has no straight-forward mapping of
+# input components to output components.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+DP4 result.fogcoord, vertex.texcoord[0], vertex.texcoord[1];
+END
+
+[fragment program]
+!!ARBfp1.0
+MOV result.color, fragment.fogcoord;
+END
+
+[test]
+ortho 0 1 0 1
+texcoord 0 (0.4, -0.3, 0.1, 0.5)
+texcoord 1 (-1, 1, 8, 0.5)
+draw rect 0 0 1 1
+probe all rgba  0.35 0 0 1
+
-- 
2.4.2