cc: Unify context losing machinery

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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 "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 126 matching lines @@
 
   // Return the current error.
   Error GetError();
 
   // Return true if GPU process reported GLInProcessContext lost or there was a
   // problem communicating with the GPU process.
   bool IsCommandBufferContextLost();
 
   CommandBufferService* GetCommandBufferService();
 
+  void set_context_lost_reason(WGC3Denum reason) {
+    context_lost_reason_ = reason;
+  }
+
  private:
   explicit GLInProcessContext(GLInProcessContext* parent);
 
   bool Initialize(const gfx::Size& size,
                   GLInProcessContext* context_group,
                   const char* allowed_extensions,
                   const int32* attrib_list,
                   gfx::GpuPreference gpu_preference);
   void Destroy();
 
   void OnContextLost();
 
   base::WeakPtr<GLInProcessContext> parent_;
   base::Closure context_lost_callback_;
   uint32 parent_texture_id_;
   scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr< ::gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr< ::gpu::gles2::GLES2Decoder> decoder_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_ptr<GLES2CmdHelper> gles2_helper_;
   scoped_ptr<TransferBuffer> transfer_buffer_;
   scoped_ptr<GLES2Implementation> gles2_implementation_;
   Error last_error_;
+  WGC3Denum context_lost_reason_;
 
   DISALLOW_COPY_AND_ASSIGN(GLInProcessContext);
 };
 
 namespace {
 
 const int32 kCommandBufferSize = 1024 * 1024;
 // TODO(kbr): make the transfer buffer size configurable via context
 // creation attributes.
 const size_t kStartTransferBufferSize = 4 * 1024 * 1024;
@@ skipping 57 matching lines @@
 // and in particular the GL implementations behind it, are not generally
 // threadsafe, so we guard entry points with a mutex.
 static base::LazyInstance<base::Lock> g_decoder_lock =
     LAZY_INSTANCE_INITIALIZER;
 
 void GLInProcessContext::PumpCommands() {
   base::AutoLock lock(g_decoder_lock.Get());
   decoder_->MakeCurrent();
   gpu_scheduler_->PutChanged();
   ::gpu::CommandBuffer::State state = command_buffer_->GetState();
-  CHECK(state.error == ::gpu::error::kNoError);
+  if (!context_lost_reason_)
+    CHECK(state.error == ::gpu::error::kNoError);
 }
 
 bool GLInProcessContext::GetBufferChanged(int32 transfer_buffer_id) {
   return gpu_scheduler_->SetGetBuffer(transfer_buffer_id);
 }
 
 uint32 GLInProcessContext::GetParentTextureId() {
   return parent_texture_id_;
 }
 
@@ skipping 1390 matching lines @@
   ClearContext();
   return gl_->MapBufferCHROMIUM(target, access);
 }
 
 WGC3Dboolean WebGraphicsContext3DInProcessCommandBufferImpl::
     unmapBufferCHROMIUM(WGC3Denum target) {
   ClearContext();
   return gl_->UnmapBufferCHROMIUM(target);
 }
 
+void WebGraphicsContext3DInProcessCommandBufferImpl::loseContextCHROMIUM(
+    WGC3Denum current, WGC3Denum other) {
+  ClearContext();
+  gl_->LoseContextCHROMIUM(current, other);
+  context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
+  context_->set_context_lost_reason(context_lost_reason_);

[jamesr, 2012/12/18 05:40:11]

why do we need to store the context loss reason on both WGC3DIPCBI and
GLInProcessContext? can this just use context_->context_lost_reason() ?

[danakj, 2012/12/18 21:26:59]

Done.

+}
+
 GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl::
     onCreateGrGLInterface() {
   return CreateCommandBufferSkiaGLBinding();
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
   // TODO(kbr): improve the precision here.
   context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
                  WebGLId, WGC3Dint, const WGC3Dchar*)
 
 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM)
 
 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
                  WGC3Denum, const WGC3Dbyte*)
 DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM,
                  WGC3Denum, const WGC3Dbyte*)
 
 }  // namespace gpu
 }  // namespace webkit