[Piglit] [PATCH 30/37] glean/tfragprog1: port XPD test to shader_runner

[Dylan Baker]

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py                                        |  1 -
 tests/glean/tfragprog1.cpp                          | 14 --------------
 .../built-in-functions/xpd.shader_test              | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/xpd.shader_test

diff --git a/tests/all.py b/tests/all.py
index ae6cb4c..637951a 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 = [
-                  'XPD test 1',
                   'Z-write test',
                   'Divide by zero test',
                   'Infinity and nan test',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index 23e20bf..9db40a4 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,20 +82,6 @@ static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"XPD test 1",
-		"!!ARBfp1.0\n"
-		"PARAM p1 = program.local[1]; \n"
-		"PARAM p2 = program.local[2]; \n"
-		"XPD result.color, p1, p2; \n"
-		"END \n",
-		{ CLAMP01(Param1[1] * Param2[2] - Param1[2] * Param2[1]),
-		  CLAMP01(Param1[2] * Param2[0] - Param1[0] * Param2[2]),
-		  CLAMP01(Param1[0] * Param2[1] - Param1[1] * Param2[0]),
-		  DONT_CARE_COLOR
-		},
-		DONT_CARE_Z
-	},
-	{
 		"Z-write test",
 		"!!ARBfp1.0\n"
 		"PARAM p = program.local[1]; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/xpd.shader_test b/tests/spec/arb_fragment_program/built-in-functions/xpd.shader_test
new file mode 100644
index 0000000..7b90433
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/xpd.shader_test
@@ -0,0 +1,21 @@
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+PARAM q = program.local[1];
+PARAM r = {1.0, 1.0, 1.0, 1.0};
+MOV result.color, r;
+XPD result.color, p, q;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (0.5, 0.25, 1.0, 0.5)
+parameter local_fp 1 (0.9, 0.5, 0.8, 0.0)
+draw rect -1 -1 2 2
+# x will be -0.3 and clamped
+probe all rgba 0.0 0.5 0.025 1.0
-- 
2.8.2