[Piglit] [PATCH v2 27/37] glean/tfragprog1: replace SLT test with shader_runner test

Dylan Baker dylan at pnwbakers.com
Tue Sep 6 19:21:05 UTC 2016


This test that replaces it is based off of the SGE test, but with the
values flipped

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

diff --git a/tests/all.py b/tests/all.py
index 2e72c8d..b5b40f0 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 = [
-                  'SLT test',
                   'SUB test (with swizzle)',
                   'SUB with saturation',
                   'SWZ test',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index ccaded2..02d5beb 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[] = {
 	{
-	{
-		"SLT test",
-		"!!ARBfp1.0\n"
-		"PARAM p1 = program.local[1]; \n"
-		"SLT result.color, fragment.color, p1; \n"
-		"END \n",
-		{ FragColor[0] < Param1[0] ? 1.0 : 0.0,
-		  FragColor[1] < Param1[1] ? 1.0 : 0.0,
-		  FragColor[2] < Param1[2] ? 1.0 : 0.0,
-		  FragColor[3] < Param1[3] ? 1.0 : 0.0,
-		},
-		DONT_CARE_Z
-	},
-	{
 		"SUB test (with swizzle)",
 		"!!ARBfp1.0\n"
 		"PARAM p1 = program.local[1]; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/slt.shader_test b/tests/spec/arb_fragment_program/built-in-functions/slt.shader_test
new file mode 100644
index 0000000..4b03ed2
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/slt.shader_test
@@ -0,0 +1,20 @@
+[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, 0.0, 0.0};
+MOV result.color, q;
+SLT result.color, p, q;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (0.0, 0.0, -1.0,  1.0)
+parameter local_fp 1 (1.0, 0.1,  0.0, -0.5)
+draw rect -1 -1 2 2
+probe all rgba 1.0 1.0 1.0 0.0
-- 
git-series 0.8.10


More information about the Piglit mailing list