Release the current context's surface before making the next context current.

We were calling context->releaseSurface on a context that was no longer current, this somtimes caused incorrect framebuffers to be deleted. BUG=angleproject:2464 Change-Id: I6859b5739a509c1343901f8c0eef1fdd1598cea1 Reviewed-on: https://chromium-review.googlesource.com/1108087Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Release the current context's surface before making the next context current.
d11efaec · Geoff Lang · Commit Bot · fddac3a3 · d11efaec
Commit d11efaec authored Jun 20, 2018 by Geoff Lang Committed by Commit Bot Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

entry_points_egl.cpp src/libGLESv2/entry_points_egl.cpp +5 -5

No files found.
--- a/src/libGLESv2/entry_points_egl.cpp
+++ b/src/libGLESv2/entry_points_egl.cpp
@@ -513,11 +513,6 @@ EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface r
    // Only call makeCurrent if the context or surfaces have changed.
    if (previousDraw != drawSurface || previousRead != readSurface || previousContext != context)
    {
-        ANGLE_EGL_TRY_RETURN(thread, display->makeCurrent(drawSurface, readSurface, context),
-                             "eglMakeCurrent", GetContextIfValid(display, context), EGL_FALSE);
-
-        thread->setCurrent(context);
-
        // Release the surface from the previously-current context, to allow
        // destroyed surfaces to delete themselves.
        if (previousContext != nullptr && context != previousContext)
@@ -525,6 +520,11 @@ EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface r
            ANGLE_EGL_TRY_RETURN(thread, previousContext->releaseSurface(display), "eglMakeCurrent",
                                 GetContextIfValid(display, context), EGL_FALSE);
        }
+
+        ANGLE_EGL_TRY_RETURN(thread, display->makeCurrent(drawSurface, readSurface, context),
+                             "eglMakeCurrent", GetContextIfValid(display, context), EGL_FALSE);
+
+        thread->setCurrent(context);
    }

    thread->setSuccess();