Only call context::unMakeCurrent() if context is changed.

src/libANGLE/Context.cpp

@@ -575,7 +575,10 @@ egl::Error Context::onDestroy(const egl::Display *display)
         mGLES1Renderer->onDestroy(this, &mState);
     }
 
-    ANGLE_TRY(unMakeCurrent(display));
+    if (mIsCurrent)
+    {
+        ANGLE_TRY(unMakeCurrent(display));
+    }
 
     for (auto fence : mFenceNVMap)
     {
@@ -691,6 +694,11 @@ egl::Error Context::makeCurrent(egl::Display *display,
         mHasBeenCurrent = true;
     }
 
+    if (mIsCurrent)
+    {
+        ANGLE_TRY(unsetDefaultFramebuffer());
+    }
+
     mFrameCapture->onMakeCurrent(this, drawSurface);
 
     // TODO(jmadill): Rework this when we support ContextImpl
@@ -709,11 +717,15 @@ egl::Error Context::makeCurrent(egl::Display *display,
         return angle::ResultToEGL(implResult);
     }
 
+    mIsCurrent = true;
+
     return egl::NoError();
 }
 
 egl::Error Context::unMakeCurrent(const egl::Display *display)
 {
+    ASSERT(mIsCurrent);
+
     ANGLE_TRY(angle::ResultToEGL(mImplementation->onUnMakeCurrent(this)));
 
     ANGLE_TRY(unsetDefaultFramebuffer());
@@ -729,6 +741,8 @@ egl::Error Context::unMakeCurrent(const egl::Display *display)
         mDisplay->returnZeroFilledBuffer(mZeroFilledBuffer.release());
     }
 
+    mIsCurrent = false;
+
     return egl::NoError();
 }
 

src/libANGLE/Context.h

@@ -771,6 +771,8 @@ class Context final : public egl::LabeledObject, angle::NonCopyable, public angl
     mutable size_t mRefCount;
 
     OverlayType mOverlay;
+
+    bool mIsCurrent = false;
 };
 
 // Thread-local current valid context bound to the thread.

src/libANGLE/Display.cpp

@@ -1282,14 +1282,11 @@ Error Display::makeCurrent(gl::Context *previousContext,
     // If the context is changing we need to update the reference counts. If it's not, e.g. just
     // changing the surfaces leave the reference count alone. Otherwise the reference count might go
     // to zero even though we know we are not done with the context.
-    bool updateRefCount = context != previousContext;
-    if (previousContext != nullptr)
+    bool contextChanged = context != previousContext;
+    if (previousContext != nullptr && contextChanged)
     {
         ANGLE_TRY(previousContext->unMakeCurrent(this));
-        if (updateRefCount)
-        {
-            ANGLE_TRY(releaseContext(previousContext));
-        }
+        ANGLE_TRY(releaseContext(previousContext));
     }
 
     ANGLE_TRY(mImplementation->makeCurrent(this, drawSurface, readSurface, context));
@@ -1297,7 +1294,7 @@ Error Display::makeCurrent(gl::Context *previousContext,
     if (context != nullptr)
     {
         ANGLE_TRY(context->makeCurrent(this, drawSurface, readSurface));
-        if (updateRefCount)
+        if (contextChanged)
         {
             context->addRef();
         }