Make sure FBO is correct for both kModeProcess and kModeDraw

android_webview/browser/shared_renderer_state.cc

 // Copyright 2014 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 "android_webview/browser/shared_renderer_state.h"
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/hardware_renderer.h"
@@ skipping 241 matching lines @@
     base::AutoLock lock(lock_);
     if (renderer_manager_key_ != manager->NullKey()) {
       manager->DidDrawGL(renderer_manager_key_);
     }
   }
 
   ScopedAppGLStateRestore state_restore(
       draw_info->mode == AwDrawGLInfo::kModeDraw
           ? ScopedAppGLStateRestore::MODE_DRAW
           : ScopedAppGLStateRestore::MODE_RESOURCE_MANAGEMENT);
+  // Set the correct FBO before any GL command is run. The GL commands run in
+  // kModeDraw and kModeProcess may require a correctly bound FBO.
+  if (hardware_renderer_) {
+    hardware_renderer_->SetBackingFrameBufferObject(
+        state_restore.framebuffer_binding_ext());

[boliu, 2015/09/14 21:25:35]

Limit this to kModeDraw only. You can probably move up the lazy create from
below

[hush (inactive), 2015/09/14 23:00:27]

Done.

+  }
+
   ScopedAllowGL allow_gl;
 
   if (draw_info->mode == AwDrawGLInfo::kModeProcessNoContext) {
     LOG(ERROR) << "Received unexpected kModeProcessNoContext";
   }
 
   if (IsInsideHardwareRelease()) {
     hardware_renderer_.reset();
     // Flush the idle queue in tear down.
     DeferredGpuCommandService::GetInstance()->PerformAllIdleWork();
     return;
   }
 
   if (draw_info->mode != AwDrawGLInfo::kModeDraw) {
     if (draw_info->mode == AwDrawGLInfo::kModeProcess) {
       DeferredGpuCommandService::GetInstance()->PerformIdleWork(true);

[jbauman, 2015/09/14 21:07:30]

The hardware_renderer_ won't do gl_surface_->ResetBackingFrameBufferObject(); in
this case. Could that cause problems?

[hush (inactive), 2015/09/14 21:20:17]

I think it won't cause problems as long as the correct FBO is already set before
GL commands are run. I can probably remove
gl_surface_->ResetBackingFrameBufferObject(); from hardware_renderer too.

[boliu, 2015/09/14 21:25:35]

Idea is FBO will always be the correct one at all times (instead of only during
draw like it is now). So whatever context this idle work is running on should
have the right FBO too.

     }
     return;
   }
 
   if (!hardware_renderer_) {
     hardware_renderer_.reset(new HardwareRenderer(this));
     hardware_renderer_->CommitFrame();
   }
 
   hardware_renderer_->DrawGL(state_restore.stencil_enabled(),
-                             state_restore.framebuffer_binding_ext(),
                              draw_info);
   DeferredGpuCommandService::GetInstance()->PerformIdleWork(false);
 }
 
 void SharedRendererState::ReleaseHardwareDrawIfNeededOnUI() {
   ReleaseCompositorResourcesIfNeededOnUI(true);
 }
 
 void SharedRendererState::DeleteHardwareRendererOnUI() {
   ReleaseCompositorResourcesIfNeededOnUI(false);
@@ skipping 53 matching lines @@
     : shared_renderer_state_(shared_renderer_state) {
   DCHECK(!shared_renderer_state_->IsInsideHardwareRelease());
   shared_renderer_state_->SetInsideHardwareRelease(true);
 }
 
 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
   shared_renderer_state_->SetInsideHardwareRelease(false);
 }
 
 }  // namespace android_webview