Bug 1560736 - MakeCurrent after GeckoSurfaceTexture::DestroyUnused. r…

…=snorp Seems like GeckoSurfaceTexture::DestroyUnused can change the current context. Differential Revision: https://phabricator.services.mozilla.com/D36685 --HG-- extra : moz-landing-system : lando
dothq · Jul 3, 2019 · c01f565 · c01f565
1 parent 043855a
commit c01f565
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
@@ -786,6 +786,7 @@ void CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
 
 #ifdef MOZ_WIDGET_ANDROID
   java::GeckoSurfaceTexture::DestroyUnused((int64_t)mGLContext.get());
+  mGLContext->MakeCurrent();  // DestroyUnused can change the current context!
 #endif
 
   // Default blend function implements "OVER"

diff --git a/gfx/webrender_bindings/RenderCompositorEGL.cpp b/gfx/webrender_bindings/RenderCompositorEGL.cpp
@@ -94,6 +94,7 @@ bool RenderCompositorEGL::BeginFrame() {
 
 #ifdef MOZ_WIDGET_ANDROID
   java::GeckoSurfaceTexture::DestroyUnused((int64_t)gl());
+  gl()->MakeCurrent();  // DestroyUnused can change the current context!
 #endif
 
   return true;