[Piglit] [PATCH 06/13] glean/glsl1: Delete duplicated gl_*Color tests.

[Matt Turner]

---
 tests/all.py           |  4 +---
 tests/glean/tglsl1.cpp | 40 ----------------------------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 7ce90d8..b86a93a 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -145,9 +145,7 @@ glean['texUnits'] = GleanTest('texUnits')
 glean['vertArrayBGRA'] = GleanTest('vertArrayBGRA')
 glean['vertattrib'] = GleanTest('vertattrib')
 
-glean_glsl_tests = ['Directly set fragment color',
-                    'Directly set vertex color',
-                    'Pass-through vertex color',
+glean_glsl_tests = [
                     'Primary plus secondary color',
                     'Empty blocks ({}), nil (;) statements',
                     'Global vars and initializers',
diff --git a/tests/glean/tglsl1.cpp b/tests/glean/tglsl1.cpp
index 0a943a0..78184a7 100644
--- a/tests/glean/tglsl1.cpp
+++ b/tests/glean/tglsl1.cpp
@@ -112,46 +112,6 @@ static const GLfloat FogColor[4] = { FOG_R, FOG_G, FOG_B, FOG_A };
 static const ShaderProgram Programs[] = {
 	// Simple tests =======================================================
 	{
-		"Directly set fragment color",  // name
-		NO_VERTEX_SHADER,  // vertex shader
-		// fragment shader:
-		"void main() { \n"
-		"   gl_FragColor = vec4(1.0, 0.5, 0.25, 0.0); \n"
-		"} \n",
-		{ 1.0, 0.5, 0.25, 0.0 }, // expectedColor
-		DONT_CARE_Z,  // expectedZ
-		FLAG_NONE  // flags
-	},
-
-	{
-		"Directly set vertex color",
-		"void main() { \n"
-		"   gl_Position = ftransform(); \n"
-		"   gl_FrontColor = vec4(0.5, 1.0, 0.25, 0.0); \n"
-		"} \n",
-		NO_FRAGMENT_SHADER,
-		{ 0.5, 1.0, 0.25, 0.0 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"Pass-through vertex color",
-		// vert shader:
-		"void main() { \n"
-		"   gl_Position = ftransform(); \n"
-		"   gl_FrontColor = vec4(0.25, 1.0, 0.75, 0.0); \n"
-		"} \n",
-		// frag shader:
-		"void main() { \n"
-		"   gl_FragColor = gl_Color; \n"
-		"} \n",
-		{ 0.25, 1.0, 0.75, 0.0 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
 		"Primary plus secondary color",
 		// vert shader:
 		"void main() { \n"
-- 
1.8.3.2