[v2,10/37] glean/tfragprog1: port EX2 test to shader_runner

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

Details

Message ID 89c5f3235a734836d4aabced9155ecaf931b2676.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                                         | 18 ------------------
 tests/spec/arb_fragment_program/built-in-functions/ex2.shader_test | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/ex2.shader_test

Patch hide | download patch | download mbox

diff --git a/tests/all.py b/tests/all.py
index 2d2314d..57a5114 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 = [
-                  'EX2 test',
                   'FLR test',
                   'FRC test',
                   'LG2 test',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index b39862d..eac70e0 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,24 +82,6 @@  static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"EX2 test",
-		"!!ARBfp1.0\n"
-                "PARAM scale = {0.01, 0.01, 0.01, 0.01}; \n"
-		"PARAM values = {0.0, 1.0, 4.0, -2.0 }; \n"
-                "TEMP t; \n"
-		"EX2 t.x, values.x; \n"
-		"EX2 t.y, values.y; \n"
-		"EX2 t.z, values.z; \n"
-		"EX2 t.w, values.w; \n"
-		"MUL result.color, t, scale; \n"
-		"END \n",
-		{  1.0 * 0.01,
-                   2.0 * 0.01,
-                  16.0 * 0.01,
-                  0.25 * 0.01 },
-		DONT_CARE_Z
-	},
-	{
 		"FLR test",
 		"!!ARBfp1.0\n"
 		"PARAM values = {4.8, 0.3, -0.2, 1.2}; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/ex2.shader_test b/tests/spec/arb_fragment_program/built-in-functions/ex2.shader_test
new file mode 100644
index 0000000..5a52769
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/ex2.shader_test
@@ -0,0 +1,22 @@ 
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+PARAM scale = {0.01, 0.01, 0.01, 0.01};
+TEMP t;
+EX2 t.x, p.x;
+EX2 t.y, p.y;
+EX2 t.z, p.z;
+EX2 t.w, p.w;
+MUL result.color, t, scale;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (0.0, 1.0, 4.0, -2.0)
+draw rect -1 -1 2 2
+probe all rgba 0.01 0.02 0.16 0.0025