summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-26 17:44:46 -0600
committerBrian Paul <brianp@vmware.com>2009-06-26 17:44:46 -0600
commite6c46b3344c5e3d709cf95609f142ee297479480 (patch)
tree64bb3510afe12b656f298b2459e09166b1607ff1
parent5ba2137a0e37541cd308da318565ccb69b2dae33 (diff)
glsl1: re-enable the "for-loop with continue" and "early return" tests
The infinite for-loop bug in Mesa is fixed now.
-rw-r--r--src/glean/tglsl1.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glean/tglsl1.cpp b/src/glean/tglsl1.cpp
index 170d114..64678b9 100644
--- a/src/glean/tglsl1.cpp
+++ b/src/glean/tglsl1.cpp
@@ -1090,7 +1090,6 @@ static const ShaderProgram Programs[] = {
FLAG_NONE
},
-#if 0
{
"for-loop with continue",
NO_VERTEX_SHADER,
@@ -1108,7 +1107,6 @@ static const ShaderProgram Programs[] = {
DONT_CARE_Z,
FLAG_NONE
},
-#endif
{
"do-loop with break",
@@ -2219,7 +2217,7 @@ static const ShaderProgram Programs[] = {
DONT_CARE_Z,
FLAG_NONE
},
-#if 0
+
{
"function with early return (2)", // reverse case of above
NO_VERTEX_SHADER,
@@ -2257,7 +2255,7 @@ static const ShaderProgram Programs[] = {
DONT_CARE_Z,
FLAG_NONE
},
-#endif
+
{
"nested function calls (1)",
NO_VERTEX_SHADER,