[Piglit] [PATCH v2 24/37] glean/tfragprog1: port SCS 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 --------------
 tests/spec/arb_fragment_program/built-in-functions/scs.shader_test | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/scs.shader_test

diff --git a/tests/all.py b/tests/all.py
index 1d944d8..3a82887 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 = [
-                  'SCS test',
                   'SGE test',
                   'SIN test',
                   'SIN test 2',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index ab1a8ea..0ca8837 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[] = {
 	{
-		"SCS test",
-		"!!ARBfp1.0\n"
-		"PARAM values = { 0.5, 0.5, 0.0, 0.0 }; \n"
-		"SCS result.color.x, values.x; \n"
-		"SCS result.color.y, values.y; \n"
-		"END \n",
-		{ CLAMP01(0.8775),
-		  CLAMP01(0.4794),
-		  DONT_CARE_COLOR,
-		  DONT_CARE_COLOR,
-		},
-		DONT_CARE_Z
-	},
-	{
 		"SGE test",
 		"!!ARBfp1.0\n"
 		"PARAM p0 = program.local[0]; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/scs.shader_test b/tests/spec/arb_fragment_program/built-in-functions/scs.shader_test
new file mode 100644
index 0000000..4f20728
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/scs.shader_test
@@ -0,0 +1,19 @@
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+PARAM q = {1.0, 1.0, 0.0, 0.0};
+MOV result.color, q;
+SCS result.color.x, p.x;
+SCS result.color.y, p.y;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (0.5, 0.5, 0.0, 0.0)
+draw rect -1 -1 2 2
+probe all rgba 0.8775 0.4794 0.0 0.0
-- 
git-series 0.8.10