Clear the EGL context only if our context is currently active (#5895)

jason-simmons · web-flow · commit 46b77937b39f · 2018-07-30T09:52:39.000-07:00
Fixes flutter/flutter#19566
diff --git a/shell/platform/android/android_context_gl.cc b/shell/platform/android/android_context_gl.cc
@@ -222,6 +222,9 @@ bool AndroidContextGL::MakeCurrent() {
 }
 
 bool AndroidContextGL::ClearCurrent() {
+  if (eglGetCurrentContext() != context_) {
+    return true;
+  }
   if (eglMakeCurrent(environment_->Display(), EGL_NO_SURFACE, EGL_NO_SURFACE,
                      EGL_NO_CONTEXT) != EGL_TRUE) {
     FML_LOG(ERROR) << "Could not clear the current context";

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,9 @@ bool AndroidContextGL::MakeCurrent() {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`bool AndroidContextGL::ClearCurrent() {`
	`225`	`+ if (eglGetCurrentContext() != context_) {`
	`226`	`+ return true;`
	`227`	`+ }`
`225`	`228`	`if (eglMakeCurrent(environment_->Display(), EGL_NO_SURFACE, EGL_NO_SURFACE,`
`226`	`229`	`EGL_NO_CONTEXT) != EGL_TRUE) {`
`227`	`230`	`FML_LOG(ERROR) << "Could not clear the current context";`