[v2,19/37] glean/tfragprog1: port MOV tests to shader_runner

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

Details

Message ID 4942b1e0db5cf4636de0270e1ef9bc85a5bcb626.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                                         |  8 --------
 tests/spec/arb_fragment_program/built-in-functions/mov.shader_test | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 tests/spec/arb_fragment_program/built-in-functions/mov.shader_test

Patch hide | download patch | download mbox

diff --git a/tests/all.py b/tests/all.py
index 2666271..1ba96a4 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 = [
-                  'MOV test',
                   'MUL test',
                   'masked MUL test',
                   'POW test (exponentiation)',
diff --git a/tests/glean/tfragprog1.cpp b/tests/glean/tfragprog1.cpp
index d8ba52c..b13e6cb 100644
--- a/tests/glean/tfragprog1.cpp
+++ b/tests/glean/tfragprog1.cpp
@@ -82,14 +82,6 @@  static GLfloat FogCoord = 50.0;  /* Between FogStart and FogEnd */
 // Alphabetical order, please
 static const FragmentProgram Programs[] = {
 	{
-		"MOV test",
-		"!!ARBfp1.0\n"
-		"MOV result.color, fragment.color; \n"
-		"END \n",
-		FRAGCOLOR,
-		DONT_CARE_Z,
-	},
-	{
 		"MUL test",
 		"!!ARBfp1.0\n"
 		"PARAM p = program.local[1]; \n"
diff --git a/tests/spec/arb_fragment_program/built-in-functions/mov.shader_test b/tests/spec/arb_fragment_program/built-in-functions/mov.shader_test
new file mode 100644
index 0000000..1995692
--- /dev/null
+++ b/tests/spec/arb_fragment_program/built-in-functions/mov.shader_test
@@ -0,0 +1,16 @@ 
+[require]
+GL_ARB_fragment_program
+
+[fragment program]
+!!ARBfp1.0
+PARAM p = program.local[0];
+MOV result.color, p;
+END
+
+[test]
+clear color 0.5 0.5 0.5 0.5
+clear
+
+parameter local_fp 0 (0.0, 1.0, 0.0, 0.0)
+draw rect -1 -1 2 2
+probe all rgba 0.0 1.0 0.0 0.0