Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
tests/all.py | 1 -
tests/glean/tfragprog1.cpp | 15
---------------
tests/spec/arb_fragment_program/built-in-functions/dst.shader_test | 18
++++++++++++++++++
3 files changed, 18 insertions(+), 16 deletions(-)
create mode 100644
tests/spec/arb_fragment_program/built-in-functions/dst.shader_test
diff --git a/tests/all.py b/tests/all.py
index dcb0c73..2d2314d 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -376,7 +376,6 @@ glean_glsl_tests = ['Primary plus secondary color',
'texcoord varying']
glean_fp_tests = [
- 'DST test',
'EX2 test',
'FLR test',
'FRC test',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index 2c56f28..b39862d 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,21 +82,6 @@ static GLfloat FogCoord = 50.0; /* Between FogStart and
FogEnd */
// Alphabetical order, please
static const FragmentProgram Programs[] = {
{
- "DST test",
- "!!ARBfp1.0\n"
- "# let d = 0.4 \n"
- "PARAM v1 = {9.9, 0.16, 0.16, 9.9}; \n"
- "PARAM v2 = {9.9, 2.5, 9.9, 2.5}; \n"
- "DST result.color, v1, v2; \n"
- "END \n",
- { 1.0,
- 0.4, // v1.y * v2.y
- 0.16, // v1.z
- CLAMP01(2.5) // v2.w
- },
- DONT_CARE_Z
- },
- {
"EX2 test",
"!!ARBfp1.0\n"
"PARAM scale = {0.01, 0.01, 0.01, 0.01}; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/dst.shader_test
b/tests/spec/arb_fragment_program/built-in-functions/dst.shader_test
new file mode 100644
index 0000000..d5ef557
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/dst.shader_test
@@ -0,0 +1,18 @@
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+PARAM q = program.local[1];
+DST result.color, p, q;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (9.9, 0.16, 0.16, 9.9)
+parameter local_fp 1 (9.9, 2.5, 9.9, 2.5)
+draw rect -1 -1 2 2
+probe all rgba 1.0 0.4 0.16 1.0
--
git-series 0.8.10
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
