[v2,18/37] glean/tfragprog1: port MIN test to shader_runner

Submitted by Dylan Baker on Sept. 6, 2016, 7:20 p.m.

Details

Message ID fe2ab62e934e0a459bb20d7f658ba51722f6d49e.1473189647.git-series.dylan@pnwbakers.com
State New
Headers show
Series "Port Glean Frag-prog tests to shader_runner" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Dylan Baker Sept. 6, 2016, 7:20 p.m.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
---
 tests/all.py                                                       |  1 -
 tests/glean/tfragprog1.cpp                                         | 13 -------------
 tests/spec/arb_fragment_program/built-in-functions/min.shader_test | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/min.shader_test

Patch hide | download patch | download mbox

diff --git a/tests/all.py b/tests/all.py
index 3c6d9a1..2666271 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 = [
-                  'MIN test',
                   'MOV test',
                   'MUL test',
                   'masked MUL test',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index 2a77702..d8ba52c 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,19 +82,6 @@  static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"MIN test",
-		"!!ARBfp1.0\n"
-		"PARAM p1 = program.local[1]; \n"
-		"MIN result.color, p1, fragment.color; \n"
-		"END \n",
-		{ MIN(Param1[0], FragColor[0]),
-		  MIN(Param1[1], FragColor[1]),
-		  MIN(Param1[2], FragColor[2]),
-		  MIN(Param1[3], FragColor[3]),
-		},
-		DONT_CARE_Z
-	},
-	{
 		"MOV test",
 		"!!ARBfp1.0\n"
 		"MOV result.color, fragment.color; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/min.shader_test b/tests/spec/arb_fragment_program/built-in-functions/min.shader_test
new file mode 100644
index 0000000..2a09b17
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/min.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];
+MIN 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, 0.5)
+parameter local_fp 1 (0.5, 1.0, 1.0,  1.0)
+draw rect -1 -1 2 2
+probe all rgba 0.0 0.0 0.0 0.5