commit 9ae417bde7d87c447b272ecc8cc197b0e3b8d1d9
author Cody Northrop <cody@lunarg.com> Mon Nov 17 11:50:25 2014 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Nov 21 16:49:40 2014 -0700
tree 703ee8ceb78b1216156b364700def01649d3b336
parent 01e2d661855bd285fa8f0492ea79771e3871b001

compiler_render_tests: Allow --no-BIL to work, except for tests that require GLSL

tests/compiler_render_tests.cpp

diff --git a/tests/compiler_render_tests.cpp b/tests/compiler_render_tests.cpp
index cb83653..8c972b2 100644
--- a/tests/compiler_render_tests.cpp
+++ b/tests/compiler_render_tests.cpp
@@ -1631,7 +1631,6 @@
            "   gl_FragColor = vec4(0,1,0,1);\n"
            "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleTest(vertShaderText, fragShaderText);
 }
 
@@ -1673,7 +1672,6 @@
            "   gl_FragColor = bar * scale + foo * (1.0-scale);\n"
            "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleTest(vertShaderText, fragShaderText);
 }
 
@@ -1703,7 +1701,6 @@
             "   gl_FragColor = color;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleWithVertexFetch(vertShaderText, fragShaderText);
 }
 
@@ -1737,7 +1734,6 @@
             "   gl_FragColor = color;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleWithVertexFetch(vertShaderText, fragShaderText);
 }
 
@@ -1775,7 +1771,6 @@
             "   gl_FragColor = color;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleWithVertexFetch(vertShaderText, fragShaderText);
 }
 
@@ -1812,7 +1807,6 @@
             "   outColor = texColor;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTexturedTriangle(vertShaderText, fragShaderText);
 }
 
@@ -1859,8 +1853,15 @@
             "   outColor = texColor;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = false;
+    bool backupBIL = XglTestFramework::m_use_bil;
+    if (XglTestFramework::m_use_bil) {
+        XglTestFramework::m_use_bil = false;
+        printf("Forcing GLSL for TexturedTriangleClip\n");
+    }
+
     DrawTexturedTriangle(vertShaderText, fragShaderText);
+
+    XglTestFramework::m_use_bil = backupBIL;
 }
 
 TEST_F(XglRenderTest, VSTexture)
@@ -1896,7 +1897,6 @@
             "   gl_FragColor = texColor;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTexturedTriangle(vertShaderText, fragShaderText);
 }
 
@@ -1939,7 +1939,6 @@
             "   gl_FragColor = textureLod(surface2, samplePos.xy, 0.0);\n"
             "}\n";
 
-   XglTestFramework::m_use_bil = true;
    int textureCount = g_TextureCount;
    int samplerCount = g_SamplerCount;
    DrawSamplerBindingsTriangle(vertShaderText, fragShaderText, textureCount, samplerCount);
@@ -1978,7 +1977,6 @@
             "   gl_FragColor = inColor;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleVSUniformBlock(vertShaderText, fragShaderText);
 }
 
@@ -2017,7 +2015,6 @@
             "   gl_FragColor += myRedVal.color;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleFSUniformBlockBinding(vertShaderText, fragShaderText);
 }
 
@@ -2054,7 +2051,6 @@
             "   gl_FragColor += red;\n"
             "}\n";
 
-    XglTestFramework::m_use_bil = true;
     DrawTriangleFSUniformBlockBinding(vertShaderText, fragShaderText);
 }