Only call make gl context current if not already current

Author: iskakaushik

shell/platform/android/android_context_gl.cc

@@ -252,7 +252,34 @@ bool AndroidEGLSurface::IsValid() const {
   return surface_ != EGL_NO_SURFACE;
 }
 
+bool AndroidEGLSurface::IsContextCurrent() const {
+  EGLContext current_egl_context = eglGetCurrentContext();
+  if (context_ != current_egl_context) {
+    return false;
+  }
+
+  EGLDisplay current_egl_display = eglGetCurrentDisplay();
+  if (display_ != current_egl_display) {
+    return false;
+  }
+
+  EGLSurface draw_surface = eglGetCurrentSurface(EGL_DRAW);
+  if (draw_surface != surface_) {
+    return false;
+  }
+
+  EGLSurface read_surface = eglGetCurrentSurface(EGL_READ);
+  if (read_surface != surface_) {
+    return false;
+  }
+
+  return true;
+}
+
 bool AndroidEGLSurface::MakeCurrent() const {
+  if (IsContextCurrent()) {
+    return true;
+  }
   if (eglMakeCurrent(display_, surface_, surface_, context_) != EGL_TRUE) {
     FML_LOG(ERROR) << "Could not make the context current";
     LogLastEGLError();

shell/platform/android/android_context_gl.h

@@ -81,6 +81,9 @@ class AndroidEGLSurface {
   SkISize GetSize() const;
 
  private:
+  /// Returns true if the EGLContext held is current for the display and surface
+  bool IsContextCurrent() const;
+
   const EGLSurface surface_;
   const EGLDisplay display_;
   const EGLContext context_;