[Piglit] [PATCH 07/11] glean/glsl1: Delete duplicated function tests.

[Matt Turner]

---
 tests/all.py           |   8 ---
 tests/glean/tglsl1.cpp | 155 -------------------------------------------------
 2 files changed, 163 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 984b177..d591d5e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -226,17 +226,9 @@ glean_glsl_tests = ['Directly set fragment color',
                     'shadow2D(): 2',
                     'shadow2D(): 3',
                     'shadow2D(): 4',
-                    'simple function call',
-                    'function call with inout params',
-                    'function call with in, out params',
-                    'function with early return (1)',
-                    'function with early return (2)',
-                    'function with early return (3)',
-                    'function with early return (4)',
                     'nested function calls (1)',
                     'nested function calls (2)',
                     'nested function calls (3)',
-                    'function prototype',
                     'TPPStreamCompiler::assignOperands',
                     'matrix column check (1)',
                     'matrix column check (2)',
diff --git a/tests/glean/tglsl1.cpp b/tests/glean/tglsl1.cpp
index 0cf94cb..a1dfc05 100644
--- a/tests/glean/tglsl1.cpp
+++ b/tests/glean/tglsl1.cpp
@@ -1379,140 +1379,6 @@ static const ShaderProgram Programs[] = {
 
 	// Function calls ====================================================
 	{
-		"simple function call",
-		NO_VERTEX_SHADER,
-		"vec4 avg(const in vec4 a, const in vec4 b) { \n"
-		"   return (a + b) * 0.5; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   vec4 a = vec4(1.0, 0.0, 0.5, 0.0); \n"
-		"   vec4 b = vec4(0.0, 0.8, 0.5, 0.0); \n"
-		"   gl_FragColor = avg(a, b); \n"
-		"} \n",
-		{ 0.5, 0.4, 0.5, 0.0 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function call with inout params",
-		NO_VERTEX_SHADER,
-		"void swap(inout float x, inout float y) { \n"
-		"   float t = x; \n"
-		"   x = y; \n"
-		"   y = t; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   float a = 0.5, b = 0.25; \n"
-		"   swap(a, b); \n"
-		"   gl_FragColor.x = a; \n"
-		"   gl_FragColor.y = b; \n"
-		"   gl_FragColor.z = 0.0; \n"
-		"   gl_FragColor.w = 0.0; \n"
-		"} \n",
-		{ 0.25, 0.5, 0.0, 0.0 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function call with in, out params",
-		NO_VERTEX_SHADER,
-		"void Half(in float x, out float y) { \n"
-		"   y = 0.5 * x; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   float a = 0.5, b = 0.1; \n"
-		"   Half(a, b); \n"
-		"   gl_FragColor = vec4(b); \n"
-		"} \n",
-		{ 0.25, 0.25, 0.25, 0.25 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function with early return (1)",
-		NO_VERTEX_SHADER,
-		"float minimum(in float x, in float y) { \n"
-		"   if (x < y) \n"
-		"      return x; \n"
-		"   return y; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   float a = 0.5; \n"
-		"   float z = minimum(a, 0.25); \n"
-		"   gl_FragColor = vec4(z); \n"
-		"} \n",
-		{ 0.25, 0.25, 0.25, 0.25 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function with early return (2)",  // reverse case of above
-		NO_VERTEX_SHADER,
-		"float minimum(in float x, in float y) { \n"
-		"   if (x < y) \n"
-		"      return x; \n"
-		"   return y; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   float a = 0.25; \n"
-		"   float z = minimum(a, 0.5); \n"
-		"   gl_FragColor = vec4(z); \n"
-		"} \n",
-		{ 0.25, 0.25, 0.25, 0.25 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function with early return (3)",
-		NO_VERTEX_SHADER,
-		"float val = 0.5; \n"
-		"void sub(in float x) { \n"
-		"   if (x > 0.0) \n"
-		"      return; \n"
-		"   val = 1.0; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   sub(1.0); \n"
-		"   gl_FragColor = vec4(val); \n"
-		"} \n",
-		{ 0.5, 0.5, 0.5, 0.5 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"function with early return (4)",
-		NO_VERTEX_SHADER,
-		"float val = 0.5; \n"
-		"void sub(in float x) { \n"
-		"   if (x >= 0.3) \n"
-		"      if (x >= 0.4) \n"
-		"         return; \n"
-		"   val = 1.0; \n"
-		"} \n"
-		"\n"
-		"void main() { \n"
-		"   sub(gl_TexCoord[0].s); \n"
-		"   gl_FragColor = vec4(val); \n"
-		"} \n",
-		{ 0.5, 0.5, 0.5, 0.5 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-
-	{
 		"nested function calls (1)",
 		NO_VERTEX_SHADER,
 		"float Half(const in float x) { \n"
@@ -1573,27 +1439,6 @@ static const ShaderProgram Programs[] = {
 	},
 
 	{
-		"function prototype",
-		NO_VERTEX_SHADER,
-		"float Half(const in float x); \n"
-		"\n"
-		"void main() { \n"
-		"   float a = 0.5; \n"
-		"   float b = Half(a); \n"
-		"   gl_FragColor = vec4(b); \n"
-		"} \n"
-		"\n"
-		"float Half(const in float x) { \n"
-		"   return 0.5 * x; \n"
-		"} \n"
-		"\n",
-		{ 0.25, 0.25, 0.25, 0.25 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-
-	{
 		"TPPStreamCompiler::assignOperands",
 		NO_VERTEX_SHADER,
 		"struct S { \n"
-- 
1.8.3.2