Do not make context current during context deletion.

ANGLE will make a context current during deletion, so ANGLE can release related resources, but for an external context, the API user should make sure the native context is current during deleting the ANGLE external context, so ANGLE doesn't need to make the context current. Bug: angleproject:5509 Change-Id: Ia4cee4e3965e9e9e811e3f989f6f6d72bd940f41 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2640593 Commit-Queue: Peng Huang <penghuang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Do not make context current during context deletion.
f5d56799 · Peng Huang · Commit Bot · 203154b5 · f5d56799
Commit f5d56799 authored Jan 20, 2021 by Peng Huang Committed by Commit Bot Jan 21, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Display.cpp src/libANGLE/Display.cpp +8 -0

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -1437,6 +1437,14 @@ Error Display::destroyContext(const Thread *thread, gl::Context *context)
    Surface *currentReadSurface   = thread->getCurrentReadSurface();
    bool changeContextForDeletion = context != currentContext;
+    // For external context, we cannot change the current native context, and the API user should
+    // make sure the native context is current.
+    if (changeContextForDeletion && context->isExternal())
+    {
+        ASSERT(!currentContext);
+        changeContextForDeletion = false;
+    }
    // Make the context being deleted current during its deletion.  This allows it to delete
    // any resources it's holding.
    if (changeContextForDeletion)