HLSLCompiler: fix an infinite loop when failing to compile

When compiling shaders that produce errors X3531 or X4014 even when macros is nullptr, we would try the same permutation infinitely. BUG=524297 Change-Id: Id2a26ce2a5344bff4566440342adad5031368994 Reviewed-on: https://chromium-review.googlesource.com/296441Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

HLSLCompiler: fix an infinite loop when failing to compile
0e06ea33 · Corentin Wallez · 3cf12ce6 · 0e06ea33
Commit 0e06ea33 authored Aug 31, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

HLSLCompiler.cpp src/libANGLE/renderer/d3d/HLSLCompiler.cpp +6 -5

No files found.
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
@@ -228,11 +228,12 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string 
            TRACE("\n%s", hlsl.c_str());
            TRACE("\n%s", message.c_str());
-            if (message.find("error X3531:") != std::string::npos || // "can't unroll loops marked with loop attribute"
+            if ((message.find("error X3531:") != std::string::npos ||  // "can't unroll loops marked with loop attribute"
-                message.find("error X4014:") != std::string::npos)   // "cannot have gradient operations inside loops with divergent flow control",
+                 message.find("error X4014:") != std::string::npos) && // "cannot have gradient operations inside loops with divergent flow control",
-                                                                     // even though it is counter-intuitive to disable unrolling for this error,
+                                                                       // even though it is counter-intuitive to disable unrolling for this error,
-                                                                     // some very long shaders have trouble deciding which loops to unroll and
+                                                                       // some very long shaders have trouble deciding which loops to unroll and
-                                                                     // turning off forced unrolls allows them to compile properly.
+                                                                       // turning off forced unrolls allows them to compile properly.
+                macros != nullptr)
            {
                macros = nullptr;   // Disable [loop] and [flatten]