This commit was autogenerated by Python and Bash scripting.
---
tests/all.py | 1 -
tests/shaders/generic/vp-constant-array-huge.vpfp | 138 -------------------
.../vp-constant-array-huge.shader_test | 147 +++++++++++++++++++++
3 files changed, 147 insertions(+), 139 deletions(-)
delete mode 100644 tests/shaders/generic/vp-constant-array-huge.vpfp
create mode 100644
tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
diff --git a/tests/all.py b/tests/all.py
index 3145317..a0f7add 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-constant-array')
- add_vpfpgeneric(g, 'vp-constant-array-huge')
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-huge.vpfp
b/tests/shaders/generic/vp-constant-array-huge.vpfp
deleted file mode 100644
index a838c2b..0000000
--- a/tests/shaders/generic/vp-constant-array-huge.vpfp
+++ /dev/null
@@ -1,138 +0,0 @@
-; Tests loading of an entry in a large constant array. Caught failure in the
-; 965 driver where only the first entry of the constant array was necessarily
-; correct, and the state containing the transformation matrix wasn't set up.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-PARAM vals[] = {
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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},
-
- {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},
- {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},
- {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},
- {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
-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-constant-array-huge.shader_test
b/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
new file mode 100644
index 0000000..97bd1df
--- /dev/null
+++ b/tests/spec/arb_vertex_program/vp-constant-array-huge.shader_test
@@ -0,0 +1,147 @@
+# Tests loading of an entry in a large constant array. Caught failure in the
+# 965 driver where only the first entry of the constant array was necessarily
+# correct, and the state containing the transformation matrix wasn't set up.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+PARAM vals[] = {
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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},
+
+ {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},
+ {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},
+ {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},
+ {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
+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
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
