This commit was autogenerated by Python and Bash scripting.
---
tests/all.py | 1 -
tests/shaders/generic/fp-ex2-sat.vpfp | 13 ------------
.../arb_fragment_program/fp-ex2-sat.shader_test | 23 ++++++++++++++++++++++
3 files changed, 23 insertions(+), 14 deletions(-)
delete mode 100644 tests/shaders/generic/fp-ex2-sat.vpfp
create mode 100644 tests/spec/arb_fragment_program/fp-ex2-sat.shader_test
diff --git a/tests/all.py b/tests/all.py
index 0979d17..6c06325 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1903,7 +1903,6 @@ with profile.group_manager(
g(['trinity-fp1'], run_concurrent=False)
g(['arb_fragment_program-sparse-samplers'], 'sparse-samplers')
g(['incomplete-texture', 'arb_fp'], 'incomplete-texture-arb_fp')
- add_vpfpgeneric(g, 'fp-ex2-sat')
add_vpfpgeneric(g, 'fp-two-constants')
with profile.group_manager(
diff --git a/tests/shaders/generic/fp-ex2-sat.vpfp
b/tests/shaders/generic/fp-ex2-sat.vpfp
deleted file mode 100644
index 876faef..0000000
--- a/tests/shaders/generic/fp-ex2-sat.vpfp
+++ /dev/null
@@ -1,13 +0,0 @@
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-END
-
-!!ARBfp1.0
-TEMP temp;
-EX2_SAT temp, program.local[0].x;
-MAD result.color, temp, {0.5}.x, {0.25}.x;
-END
-
-!!test
-fragment.local[0] 2.0 0.0 0.0 0.0
-expected 0.75 0.75 0.75 0.75
diff --git a/tests/spec/arb_fragment_program/fp-ex2-sat.shader_test
b/tests/spec/arb_fragment_program/fp-ex2-sat.shader_test
new file mode 100644
index 0000000..320d651
--- /dev/null
+++ b/tests/spec/arb_fragment_program/fp-ex2-sat.shader_test
@@ -0,0 +1,23 @@
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+END
+
+[fragment program]
+!!ARBfp1.0
+TEMP temp;
+EX2_SAT temp, program.local[0].x;
+MAD result.color, temp, {0.5}.x, {0.25}.x;
+END
+
+[test]
+ortho 0 1 0 1
+parameter local_fp 0 (2.0, 0.0, 0.0, 0.0)
+draw rect 0 0 1 1
+probe all rgba 0.75 0.75 0.75 0.75
+
--
2.4.2
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
