[Piglit] [PATCH 13/13] glean/glsl1: Delete duplicated discard tests.

Matt Turner mattst88 at gmail.com
Sat Jul 5 23:03:25 PDT 2014


---
 tests/all.py           |  3 ---
 tests/glean/tglsl1.cpp | 43 -------------------------------------------
 2 files changed, 46 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 5825e44..fc92d51 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -164,9 +164,6 @@ glean_glsl_tests = [
                     'gl_FragDepth writing',
                     'chained assignment',
                     'cross() function, in-place',
-                    'discard statement (1)',
-                    'discard statement (2)',
-                    'discard statement in for loop',
                     'conditional expression',
                     'conditional expression (2)',
                     'sequence (comma) operator',
diff --git a/tests/glean/tglsl1.cpp b/tests/glean/tglsl1.cpp
index 81f0d4d..b536956 100644
--- a/tests/glean/tglsl1.cpp
+++ b/tests/glean/tglsl1.cpp
@@ -360,49 +360,6 @@ static const ShaderProgram Programs[] = {
 
 	// Flow Control ======================================================
 	{
-		"discard statement (1)",
-		NO_VERTEX_SHADER,
-		"void main() { \n"
-		"   gl_FragColor = vec4(1.0); \n"
-		"   if (gl_TexCoord[0].x < 0.5) \n"
-		"      discard; \n"
-		"} \n",
-		{ 0.0, 0.0, 0.0, 0.0 },  // glClear color
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"discard statement (2)",
-		NO_VERTEX_SHADER,
-		"void main() { \n"
-		"   gl_FragColor = vec4(1.0); \n"
-		"   if (gl_TexCoord[0].x > 0.5) \n"
-		"      discard; \n"
-		"} \n",
-		{ 1.0, 1.0, 1.0, 1.0 },  // fragment color
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"discard statement in for loop",
-		NO_VERTEX_SHADER,
-		"void main() { \n"
-		"   gl_FragColor = vec4(1.0); \n"
-		"   int i; \n"
-		"   for (i = 0; i < 1000; i++) { \n"
-		"      if (i == 9) { \n"
-		"         discard; \n"
-		"      } \n"
-		"   } \n"
-		"} \n",
-		{ 0.0, 0.0, 0.0, 0.0 },  // glClear color
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
 		"conditional expression",
 		NO_VERTEX_SHADER,
 		"void main() { \n"
-- 
1.8.3.2



More information about the Piglit mailing list