[Piglit] [PATCH 33/40] Port vp-constant-array.vpfp to shader_runner

[Kenneth Graunke]

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

diff --git a/tests/all.py b/tests/all.py
index a0f7add..eb7507e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2592,7 +2592,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, 'vp-constant-array')
     add_vpfpgeneric(g, 'vp-constant-negate')
     add_vpfpgeneric(g, 'vp-exp-alias')
     add_vpfpgeneric(g, 'vp-max')
diff --git a/tests/shaders/generic/vp-constant-array.vpfp b/tests/shaders/generic/vp-constant-array.vpfp
deleted file mode 100644
index 39c397f..0000000
--- a/tests/shaders/generic/vp-constant-array.vpfp
+++ /dev/null
@@ -1,19 +0,0 @@
-; Tests loading of an entry in a constant array.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-PARAM vals[4] = { {0.5, 1.0, 2.0, 0.0},
-      	      	  {1.0, 0.0, 0.8, 0.0},
-		  {1.0, 0.0, 0.5, 0.0},
-		  {0.8, 1.0, 0.0, 0.0}
-		};
-MOV result.color, vals[3];
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-expected          0.8     1.0      0.0      0.0
-
diff --git a/tests/spec/arb_vertex_program/vp-constant-array.shader_test b/tests/spec/arb_vertex_program/vp-constant-array.shader_test
new file mode 100644
index 0000000..e87c20f
--- /dev/null
+++ b/tests/spec/arb_vertex_program/vp-constant-array.shader_test
@@ -0,0 +1,28 @@
+# Tests loading of an entry in a constant array.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+PARAM vals[4] = { {0.5, 1.0, 2.0, 0.0},
+      	      	  {1.0, 0.0, 0.8, 0.0},
+		  {1.0, 0.0, 0.5, 0.0},
+		  {0.8, 1.0, 0.0, 0.0}
+		};
+MOV result.color, vals[3];
+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.8 1.0 0.0 0.0
+
-- 
2.4.2