---
 tests/all.py           |  12 ---
 tests/glean/tglsl1.cpp | 197 -------------------------------------------------
 2 files changed, 209 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index b86a93a..539ef23 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -170,18 +170,6 @@ glean_glsl_tests = [
                     'cross() function, in-place',
                     'precision exp2',
                     'precision log2',
-                    'simple if statement, fragment shader',
-                    'simple if statement, vertex shader',
-                    'simple if statement (scalar test)',
-                    'simple if-else statement, fragment shader',
-                    'simple if-else statement, vertex shader',
-                    'while-loop',
-                    'do-loop',
-                    'for-loop',
-                    'while-loop with continue',
-                    'for-loop with continue',
-                    'do-loop with break',
-                    'do-loop with continue and break',
                     'discard statement (1)',
                     'discard statement (2)',
                     'discard statement in for loop',
diff --git a/tests/glean/tglsl1.cpp b/tests/glean/tglsl1.cpp
index 78184a7..7a661c8 100644
--- a/tests/glean/tglsl1.cpp
+++ b/tests/glean/tglsl1.cpp
@@ -453,203 +453,6 @@ static const ShaderProgram Programs[] = {
 
        // Flow Control ======================================================
        {
-               "simple if statement, fragment shader",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   // this should always be true \n"
-               "   if (gl_FragCoord.x >= 0.0) { \n"
-               "      gl_FragColor = vec4(0.5, 0.0, 0.5, 0.0); \n"
-               "   } \n"
-               "} \n",
-               { 0.5, 0.0, 0.5, 0.0 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "simple if statement, vertex shader",
-               "uniform vec4 uniform1; \n"
-               "void main() { \n"
-               "   gl_Position = ftransform(); \n"
-               "   gl_FrontColor = vec4(0.0); \n"
-               "   // this should always be true \n"
-               "   if (uniform1.x >= 0.0) { \n"
-               "      gl_FrontColor = vec4(0.5, 0.0, 0.5, 0.0); \n"
-               "   } \n"
-               "} \n",
-               NO_FRAGMENT_SHADER,
-               { 0.5, 0.0, 0.5, 0.0 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "simple if statement (scalar test)",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   float x = 1.0; \n"
-               "   if (x != 0.0) { \n"
-               "      gl_FragColor = vec4(0.5, 0.0, 0.5, 0.0); \n"
-               "   } \n"
-               "} \n",
-               { 0.5, 0.0, 0.5, 0.0 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "simple if-else statement, fragment shader",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   // this should always be false \n"
-               "   if (gl_FragCoord.x < 0.0) { \n"
-               "      gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0); \n"
-               "   } else { \n"
-               "      gl_FragColor = vec4(0.5, 0.25, 0.5, 0.0); \n"
-               "   } \n"
-               "} \n",
-               { 0.5, 0.25, 0.5, 0.0 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "simple if-else statement, vertex shader",
-               "uniform vec4 uniform1; \n"
-               "void main() { \n"
-               "   gl_Position = ftransform(); \n"
-               "   // this should always be true \n"
-               "   if (uniform1.x >= 0.0) { \n"
-               "      gl_FrontColor = vec4(0.0, 1.0, 0.0, 0.0); \n"
-               "   } else { \n"
-               "      gl_FrontColor = vec4(1.0, 0.0, 0.0, 0.0); \n"
-               "   } \n"
-               "} \n",
-               NO_FRAGMENT_SHADER,
-               { 0.0, 1.0, 0.0, 0.0 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "while-loop",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   float sum = 0.0; \n"
-               "   while (sum < 0.499999) { \n"
-               "      sum += 0.1; \n"
-               "   } \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "do-loop",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   float sum = 0.0; \n"
-               "   do { \n"
-               "      sum += 0.1; \n"
-               "   } while (sum < 0.499999); \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "for-loop",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   vec4 sum = vec4(0.0); \n"
-               "   int i; \n"
-               "   for (i = 0; i < 5; ++i) { \n"
-               "      sum += vec4(0.1); \n"
-               "   } \n"
-               "   gl_FragColor = sum; \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "while-loop with continue",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   int i = 0; \n"
-               "   float sum = 0.0; \n"
-               "   while (i < 20) { \n"
-               "      ++i; \n"
-               "      if (i > 5) \n"
-               "         continue; \n"
-               "      sum += 0.1; \n"
-               "   } \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "for-loop with continue",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   int i; \n"
-               "   float sum = 0.0; \n"
-               "   for (i = 0; i < 20; ++i) { \n"
-               "      if (i > 4) \n"
-               "         continue; \n"
-               "      sum += 0.1; \n"
-               "   } \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "do-loop with break",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   float sum = 0.0; \n"
-               "   do { \n"
-               "      sum += 0.1; \n"
-               "      if (sum >= 0.499999) \n"
-               "         break; \n"
-               "   } while (true); \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
-               "do-loop with continue and break",
-               NO_VERTEX_SHADER,
-               "void main() { \n"
-               "   float sum = 0.0; \n"
-               "   do { \n"
-               "      sum += 0.1; \n"
-               "      if (sum < 0.499999) \n"
-               "         continue; \n"
-               "      break; \n"
-               "   } while (true); \n"
-               "   gl_FragColor = vec4(sum); \n"
-               "} \n",
-               { 0.5, 0.5, 0.5, 0.5 },
-               DONT_CARE_Z,
-               FLAG_NONE
-       },
-
-       {
                "discard statement (1)",
                NO_VERTEX_SHADER,
                "void main() { \n"
-- 
1.8.3.2

_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to