[Piglit] [PATCH 26/40] Port vp-arl-constant-array-varying.vpfp to shader_runner

[Kenneth Graunke]

This commit was autogenerated by Python and Bash scripting.
---
 tests/all.py                                       |  1 -
 .../generic/vp-arl-constant-array-varying.vpfp     | 24 ---------------
 .../vp-arl-constant-array-varying.shader_test      | 34 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 25 deletions(-)
 delete mode 100644 tests/shaders/generic/vp-arl-constant-array-varying.vpfp
 create mode 100644 tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test

diff --git a/tests/all.py b/tests/all.py
index 50267cc..316aa2e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2593,7 +2593,6 @@ with profile.group_manager(
     g(['vp-bad-program'], run_concurrent=False)
     g(['vp-max-array'], run_concurrent=False)
     add_vpfpgeneric(g, 'vp-arl-constant-array')
-    add_vpfpgeneric(g, 'vp-arl-constant-array-varying')
     add_vpfpgeneric(g, 'vp-arl-env-array')
     add_vpfpgeneric(g, 'vp-arl-local-array')
     add_vpfpgeneric(g, 'vp-arl-neg-array')
diff --git a/tests/shaders/generic/vp-arl-constant-array-varying.vpfp b/tests/shaders/generic/vp-arl-constant-array-varying.vpfp
deleted file mode 100644
index 6382ffa..0000000
--- a/tests/shaders/generic/vp-arl-constant-array-varying.vpfp
+++ /dev/null
@@ -1,24 +0,0 @@
-; Tests loading of a per-vertex variable entry from a constant array.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-PARAM vals[] =	{
-			{ 0.75,  0.25, 0.0, 0.0},
-			{-0.25,  0.25, 0.0, 0.0},
-			{ 0.75, -0.75, 0.0, 0.0},
-			{-0.25, -0.75, 0.0, 0.0}
-		};
-ADDRESS A0;
-TEMP temp;
-MUL temp.x, vertex.position.y, {2};
-ADD temp.x, temp, vertex.position.x;
-ARL A0.x, temp.x;
-ADD result.color, vals[A0.x], vertex.position.xyzz;
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-expected          0.75     0.25      0.0      0.0
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test
new file mode 100644
index 0000000..4bc7b52
--- /dev/null
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array-varying.shader_test
@@ -0,0 +1,34 @@
+# Tests loading of a per-vertex variable entry from a constant array.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+PARAM vals[] =	{
+			{ 0.75,  0.25, 0.0, 0.0},
+			{-0.25,  0.25, 0.0, 0.0},
+			{ 0.75, -0.75, 0.0, 0.0},
+			{-0.25, -0.75, 0.0, 0.0}
+		};
+ADDRESS A0;
+TEMP temp;
+MUL temp.x, vertex.position.y, {2};
+ADD temp.x, temp, vertex.position.x;
+ARL A0.x, temp.x;
+ADD result.color, vals[A0.x], vertex.position.xyzz;
+END
+
+[fragment program]
+!!ARBfp1.0
+MOV result.color, fragment.color;
+END
+
+[test]
+ortho 0 1 0 1
+draw rect 0 0 1 1
+probe all rgba  0.75 0.25 0.0 0.0
+
-- 
2.4.2