[v2,26/37] glean/tfragprog1: port SIN tests to shader_runner

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

Details

Message ID 71b1805109171a15918f4450c8a653fa62e21ab6.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:21 p.m.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
---
 tests/all.py                                                               |  2 --
 tests/glean/tfragprog1.cpp                                                 | 31 -------------------------------
 tests/spec/arb_fragment_program/built-in-functions/sin-clamped.shader_test | 20 ++++++++++++++++++++
 tests/spec/arb_fragment_program/built-in-functions/sin.shader_test         | 20 ++++++++++++++++++++
 4 files changed, 40 insertions(+), 33 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/sin-clamped.shader_test
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/sin.shader_test

Patch hide | download patch | download mbox

diff --git a/tests/all.py b/tests/all.py
index 76b0f6a..2e72c8d 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -376,8 +376,6 @@  glean_glsl_tests = ['Primary plus secondary color',
                     'texcoord varying']
 
 glean_fp_tests = [
-                  'SIN test',
-                  'SIN test 2',
                   'SLT test',
                   'SUB test (with swizzle)',
                   'SUB with saturation',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index 955166b..ccaded2 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,37 +82,6 @@  static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"SIN test",
-		"!!ARBfp1.0\n"
-		"PARAM values = { 1.57079, -1.57079, 0.5, 1.0 }; \n"
-		"SIN result.color.x, values.x; \n"
-		"SIN result.color.y, values.y; \n"
-		"SIN result.color.z, values.z; \n"
-		"SIN result.color.w, values.w; \n"
-		"END \n",
-		{ CLAMP01(1.0),
-		  CLAMP01(-1.0),
-		  CLAMP01(0.4794),
-		  CLAMP01(0.8414)
-		},
-		DONT_CARE_Z
-	},
-	{
-		"SIN test 2",
-		"!!ARBfp1.0\n"
-		"PARAM values = { 3.14159, -3.14159, 6.78319, -5.78319 }; \n"
-		"SIN result.color.x, values.x; \n"
-		"SIN result.color.y, values.y; \n"
-		"SIN result.color.z, values.z; \n"
-		"SIN result.color.w, values.w; \n"
-		"END \n",
-		{ CLAMP01(0.0),
-		  CLAMP01(0.0),
-		  CLAMP01(0.4794),
-		  CLAMP01(0.4794)
-		},
-		DONT_CARE_Z
-	},
 	{
 		"SLT test",
 		"!!ARBfp1.0\n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/sin-clamped.shader_test b/tests/spec/arb_fragment_program/built-in-functions/sin-clamped.shader_test
new file mode 100644
index 0000000..443857c
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/sin-clamped.shader_test
@@ -0,0 +1,20 @@ 
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+SIN result.color.x, p.x;
+SIN result.color.y, p.y;
+SIN result.color.z, p.z;
+SIN result.color.w, p.w;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (3.14159, -3.14159, 6.78319, -5.78319)
+draw rect -1 -1 2 2
+# Note the y will be clamped
+probe all rgba 0.0 0.0 0.4794 0.4794
diff --git a/tests/spec/arb_fragment_program/built-in-functions/sin.shader_test b/tests/spec/arb_fragment_program/built-in-functions/sin.shader_test
new file mode 100644
index 0000000..319845f
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/sin.shader_test
@@ -0,0 +1,20 @@ 
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+SIN result.color.x, p.x;
+SIN result.color.y, p.y;
+SIN result.color.z, p.z;
+SIN result.color.w, p.w;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (1.57079, -1.57079, 0.5, 1.0)
+draw rect -1 -1 2 2
+# Note the y will be clamped from -1.0
+probe all rgba 1.0 0.0 0.4794 0.8414