Reland "gpu: Fix Vivante's "hisilicon" GPUs"

ui/gl/gl_context_egl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_context_egl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
@@ skipping 10 matching lines @@
 #endif
 
 using ui::GetLastEGLErrorString;
 
 namespace gfx {
 
 GLContextEGL::GLContextEGL(GLShareGroup* share_group)
     : GLContext(share_group),
       context_(NULL),
       display_(NULL),
-      config_(NULL) {
+      config_(NULL),
+      recreate_surface_on_makecurrent_(false) {
 }
 
 bool GLContextEGL::Initialize(
     GLSurface* compatible_surface, GpuPreference gpu_preference) {
   DCHECK(compatible_surface);
   DCHECK(!context_);
 
   static const EGLint kContextAttributes[] = {
     EGL_CONTEXT_CLIENT_VERSION, 2,
     EGL_NONE
@@ skipping 63 matching lines @@
              << GetLastEGLErrorString();
     return false;
   }
 
   SetCurrent(this, surface);
   if (!InitializeExtensionBindings()) {
     ReleaseCurrent(surface);
     return false;
   }
 
+#if defined(OS_ANDROID)
+  if (!RecreateSurfaceIfNeeded(surface))
+    return false;
+#endif
+
   if (!surface->OnMakeCurrent(this)) {
     LOG(ERROR) << "Could not make current.";
     return false;
   }
 
   SetRealGLApi();
   return true;
 }
 
+void GLContextEGL::SetRecreateSurfaceOnMakeCurrent() {
+  recreate_surface_on_makecurrent_ = true;
+}
+
+bool GLContextEGL::RecreateSurfaceIfNeeded(GLSurface* surface) {
+  if (!recreate_surface_on_makecurrent_ ||
+      !surface ||
+      surface->IsOffscreen() ||
+      surface->GetBackingFrameBufferObject())
+    return true;
+
+  // This is specifically needed for Vivante GPU's on Android.
+  // A native view surface will not be configured correctly
+  // unless we do all of the following steps after making the
+  // surface current.
+  GLint fbo = 0;
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
+  glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
+
+  eglMakeCurrent(display_,
+                 EGL_NO_SURFACE,
+                 EGL_NO_SURFACE,
+                 EGL_NO_CONTEXT);
+  if (!surface->Recreate()) {
+    LOG(ERROR) << "Failed to recreate surface";
+    return false;
+  }
+  if (!eglMakeCurrent(display_,
+                      surface->GetHandle(),
+                      surface->GetHandle(),
+                      context_)) {
+    LOG(ERROR) << "eglMakeCurrent failed with error "
+               << GetLastEGLErrorString();
+    return false;
+  }
+
+  glBindFramebufferEXT(GL_FRAMEBUFFER, fbo);
+  return true;
+}
+
 void GLContextEGL::ReleaseCurrent(GLSurface* surface) {
   if (!IsCurrent(surface))
     return;
 
   SetCurrent(NULL, NULL);
   eglMakeCurrent(display_,
                  EGL_NO_SURFACE,
                  EGL_NO_SURFACE,
                  EGL_NO_CONTEXT);
 }
@@ skipping 50 matching lines @@
 
 #if !defined(OS_ANDROID)
 bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {
   DCHECK(bytes);
   *bytes = 0;
   return false;
 }
 #endif
 
 }  // namespace gfx