[Piglit] [PATCH v2 12/37] glean/tfragprog1: port FRC test to shader_runner

Dylan Baker dylan at pnwbakers.com
Tue Sep 6 19:20:50 UTC 2016


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

diff --git a/tests/all.py b/tests/all.py
index 428d1cb..5f6fac1 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 = [
-                  'FRC test',
                   'LG2 test',
                   'LIT test 1',
                   'LIT test 2 (degenerate case: 0 ^ 0 -> 1)',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index f71d032..a65fa38 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,15 +82,6 @@ static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"FRC test",
-		"!!ARBfp1.0\n"
-		"PARAM values = {-1.1, 0.1, -2.2, 2.4 }; \n"
-		"FRC result.color, values; \n"
-		"END \n",
-		{ 0.9, 0.1, 0.8, 0.4 },
-		DONT_CARE_Z
-	},
-	{
 		"LG2 test",
 		"!!ARBfp1.0\n"
 		"PARAM values = {64.0, 1, 30, 4}; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/frc.shader_test b/tests/spec/arb_fragment_program/built-in-functions/frc.shader_test
new file mode 100644
index 0000000..54c7be1
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/frc.shader_test
@@ -0,0 +1,16 @@
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+FRC result.color, p;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (-1.1, 0.1, -2.2, 2.4)
+draw rect -1 -1 2 2
+probe all rgba 0.9 0.1 0.8 0.4
-- 
git-series 0.8.10


More information about the Piglit mailing list