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

Kenneth Graunke kenneth at whitecape.org
Sat Jun 6 19:11:53 PDT 2015


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

diff --git a/tests/all.py b/tests/all.py
index 316aa2e..8d393e2 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-arl-constant-array')
     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.vpfp b/tests/shaders/generic/vp-arl-constant-array.vpfp
deleted file mode 100644
index 0dcb28d..0000000
--- a/tests/shaders/generic/vp-arl-constant-array.vpfp
+++ /dev/null
@@ -1,23 +0,0 @@
-; Tests loading of a variable entry from 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}
-		};
-ADDRESS A0;
-ARL A0.x, program.local[0].x;
-MOV result.color, vals[A0.x+0];
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-vertex.local[0]   3.0     0.0      0.0      0.0
-expected          0.8     1.0      0.0      0.0
-
diff --git a/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test b/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test
new file mode 100644
index 0000000..c0957b7
--- /dev/null
+++ b/tests/spec/arb_vertex_program/vp-arl-constant-array.shader_test
@@ -0,0 +1,32 @@
+# Tests loading of a 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[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}
+		};
+ADDRESS A0;
+ARL A0.x, program.local[0].x;
+MOV result.color, vals[A0.x+0];
+END
+
+[fragment program]
+!!ARBfp1.0
+MOV result.color, fragment.color;
+END
+
+[test]
+ortho 0 1 0 1
+parameter local_vp 0 (3.0, 0.0, 0.0, 0.0)
+draw rect 0 0 1 1
+probe all rgba  0.8 1.0 0.0 0.0
+
-- 
2.4.2



More information about the Piglit mailing list