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

diff --git a/tests/all.py b/tests/all.py
index 57a5114..428d1cb 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 = [
-                  'FLR test',
                   'FRC test',
                   'LG2 test',
                   'LIT test 1',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index eac70e0..f71d032 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,22 +82,6 @@ static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"FLR test",
-		"!!ARBfp1.0\n"
-		"PARAM values = {4.8, 0.3, -0.2, 1.2}; \n"
-		"PARAM scale = {0.1, 0.1, 0.1, 0.1}; \n"
-		"TEMP t; \n"
-		"FLR t, values; \n"
-		"MUL result.color, t, scale; \n"
-		"END \n",
-		{ 0.4,
-		  0.0,
-		  CLAMP01(-0.1),
-		  0.1
-		},
-		DONT_CARE_Z
-	},
-	{
 		"FRC test",
 		"!!ARBfp1.0\n"
 		"PARAM values = {-1.1, 0.1, -2.2, 2.4 }; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/flr.shader_test b/tests/spec/arb_fragment_program/built-in-functions/flr.shader_test
new file mode 100644
index 0000000..0aa50e2
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/flr.shader_test
@@ -0,0 +1,19 @@
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+PARAM scale = {0.1, 0.1, 0.1, 0.1};
+TEMP t;
+FLR t, p;
+MUL result.color, t, scale;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (4.8, 0.2, -0.2, 1.2)
+draw rect -1 -1 2 2
+probe all rgba 0.4 0.0 0.0 0.1
-- 
git-series 0.8.10