GL: Protect against infinite loops with CONTEXT_LOST in CheckError

If the GL context generates a CONTEXT_LOST error, stop checking for errors. This error will be generated continuously and result in an infinite loop. BUG=angleproject:3020 Change-Id: Ib78d1ff3f84103e658307f2f892538700916449d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2142312Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

GL: Protect against infinite loops with CONTEXT_LOST in CheckError
23196076 · Geoff Lang · Commit Bot · 9f14f785 · 23196076
Commit 23196076 authored Apr 08, 2020 by Geoff Lang Committed by Commit Bot Apr 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +4 -2

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1965,9 +1965,11 @@ angle::Result CheckError(const gl::Context *context,
        ERR() << "GL call " << call << " generated error " << gl::FmtHex(error) << " in " << file
              << ", " << function << ":" << line << ". ";
-        // Check that only one GL error was generated, ClearErrors should have been called first
+        // Check that only one GL error was generated, ClearErrors should have been called first.
+        // Skip GL_CONTEXT_LOST errors, they will be generated continuously and result in an
+        // infinite loop.
        GLenum nextError = functions->getError();
-        while (nextError != GL_NO_ERROR)
+        while (nextError != GL_NO_ERROR && nextError != GL_CONTEXT_LOST)
        {
            ERR() << "Additional GL error " << gl::FmtHex(nextError) << " generated.";
            nextError = functions->getError();