EGL: Respect eglMakeCurrent with a null context.

Our context virtualization code would try to optimize this case and leave the current context bound when possible. This has the side effect of leaving the current surface bound too, even if it was deleted. During Chrome's window resizing, it deletes the window, calls eglMakeCurrent with null and then recreates the window. This causes an error because the window still exists because it was left current in ANGLE. Bug: chromium:1167718 Change-Id: I857be88be48dfa9c0dd9173f235e155e727e3014 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2637717Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>

EGL: Respect eglMakeCurrent with a null context.
df33d561 · Geoff Lang · Commit Bot · 2ebff7f2 · df33d561
Commit df33d561 authored Jan 19, 2021 by Geoff Lang Committed by Commit Bot Jan 20, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

DisplayAndroid.cpp src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp +4 -5

No files found.
--- a/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
+++ b/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
@@ -392,12 +392,11 @@ egl::Error DisplayAndroid::makeCurrent(egl::Display *display,
        return DisplayGL::makeCurrent(display, drawSurface, readSurface, context);
    }

-    // The context should never change when context virtualization is being used, even when a null
-    // context is being bound.
-    if (mVirtualizedContexts)
+    // The context should never change when context virtualization is being used unless binding a
+    // null context.
+    if (mVirtualizedContexts && newContext != EGL_NO_CONTEXT)
    {
-        ASSERT(newContext == EGL_NO_CONTEXT || currentContext.context == EGL_NO_CONTEXT ||
-               newContext == currentContext.context);
+        ASSERT(currentContext.context == EGL_NO_CONTEXT || newContext == currentContext.context);

        newContext = mRenderer->getContext();