GPU client side changes for GpuMemoryBuffers

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
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gl_context_virtual.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
+#include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "ui/gl/gl_context.h"
+#include "ui/gl/gl_image.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gl_surface.h"
 #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h"
 
 using gpu::Buffer;
 using gpu::CommandBuffer;
 using gpu::CommandBufferService;
 using gpu::gles2::GLES2CmdHelper;
 using gpu::gles2::GLES2Implementation;
 using gpu::GpuScheduler;
 using gpu::TransferBuffer;
 using gpu::TransferBufferManager;
 using gpu::TransferBufferManagerInterface;
 
+namespace gpu {
+namespace gles2 {

[joth, 2013/05/03 02:04:11]

move this class to 
namespace webkit {
namespace gpu {
namespace {
...


i.e. line   228

[kaanb, 2013/05/03 02:37:31]

Done.

+
+class GpuMemoryBufferImageManagerFactory : public GpuMemoryBufferFactory {
+ public:
+  explicit GpuMemoryBufferImageManagerFactory(ImageManager* image_manager);
+  virtual ~GpuMemoryBufferImageManagerFactory();
+
+  // methods from GpuMemoryBufferFactory
+  virtual scoped_ptr<GpuMemoryBuffer> CreateGpuMemoryBuffer(
+      int width, int height, int image_id) OVERRIDE;
+ private:
+  ImageManager* image_manager_;

[joth, 2013/05/03 02:04:11]

scoped_refptr<>

[kaanb, 2013/05/03 02:37:31]

Done.

+  DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImageManagerFactory);
+};
+
+GpuMemoryBufferImageManagerFactory::GpuMemoryBufferImageManagerFactory(
+    ImageManager* image_manager) : image_manager_(image_manager) {
+}
+
+GpuMemoryBufferImageManagerFactory::~GpuMemoryBufferImageManagerFactory() {
+}
+
+scoped_ptr<GpuMemoryBuffer> GpuMemoryBufferImageManagerFactory::
+    CreateGpuMemoryBuffer(int width, int height, int image_id) {
+  scoped_ptr<GpuMemoryBuffer> buffer =
+      GetProcessDefaultGpuMemoryBufferFactory().Run(width, height);
+  scoped_refptr<gfx::GLImage> gl_image =
+      gfx::GLImage::CreateGLImageForGpuMemoryBuffer(buffer->GetNativeBuffer(),
+                                                    gfx::Size(width, height));
+  image_manager_->AddImage(gl_image, image_id);
+  return buffer.Pass();
+}
+
+}
+}
+
+
 namespace webkit {
 namespace gpu {
 
 class GLInProcessContext {
  public:
   // These are the same error codes as used by EGL.
   enum Error {
     SUCCESS             = 0x3000,
     NOT_INITIALIZED     = 0x3001,
     BAD_ATTRIBUTE       = 0x3004,
@@ skipping 93 matching lines @@
   bool Initialize(bool is_offscreen,
                   gfx::AcceleratedWidget window,
                   const gfx::Size& size,
                   const char* allowed_extensions,
                   const int32* attrib_list,
                   gfx::GpuPreference gpu_preference);
   void Destroy();
 
   void OnContextLost();
 
+  ::gpu::gles2::ImageManager* GetImageManager();
+
   base::Closure context_lost_callback_;
   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_;
@@ skipping 235 matching lines @@
 
 // TODO(gman): Remove This
 void GLInProcessContext::DisableShaderTranslation() {
   NOTREACHED();
 }
 
 GLES2Implementation* GLInProcessContext::GetImplementation() {
   return gles2_implementation_.get();
 }
 
+::gpu::gles2::ImageManager* GLInProcessContext::GetImageManager() {
+  return decoder_->GetContextGroup()->image_manager();
+}
+
 GLInProcessContext::GLInProcessContext(bool share_resources)
     : last_error_(SUCCESS),
       share_resources_(share_resources),
       context_lost_(false) {
 }
 
 bool GLInProcessContext::Initialize(
     bool is_offscreen,
     gfx::AcceleratedWidget window,
     const gfx::Size& size,
@@ skipping 164 matching lines @@
   transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get()));
 
   // Create the object exposing the OpenGL API.
   gles2_implementation_.reset(new GLES2Implementation(
       gles2_helper_.get(),
       context_group ? context_group->GetImplementation()->share_group() : NULL,
       transfer_buffer_.get(),
       true,
       false));
 
+  // GLES2Implementation::Initialize() which is called next
+  // needs the GpuMemoryBufferFactory so we set it before
+  // Initialize is called.
+  gles2_implementation_->SetGpuMemoryBufferFactory(
+      new ::gpu::gles2::GpuMemoryBufferImageManagerFactory(GetImageManager()));
+
   if (!gles2_implementation_->Initialize(
       kStartTransferBufferSize,
       kMinTransferBufferSize,
       kMaxTransferBufferSize)) {
     return false;
   }
 
   if (share_resources_) {
     AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(),
                                         g_all_shared_contexts.Get());
@@ skipping 1084 matching lines @@
   ClearContext();
   gl_->DeleteBuffers(1, &buffer);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteFramebuffer(
     WebGLId framebuffer) {
   ClearContext();
   gl_->DeleteFramebuffers(1, &framebuffer);
 }
 
+void WebGraphicsContext3DInProcessCommandBufferImpl::deleteImageBuffer(
+    WebGLId imagebuffer) {
+  ClearContext();
+  gl_->DeleteImageBuffers(1, &imagebuffer);
+}
+
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteProgram(
     WebGLId program) {
   ClearContext();
   gl_->DeleteProgram(program);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteRenderbuffer(
     WebGLId renderbuffer) {
   ClearContext();
   gl_->DeleteRenderbuffers(1, &renderbuffer);
@@ skipping 104 matching lines @@
 }
 
 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();
   }
 }
 
+void WebGraphicsContext3DInProcessCommandBufferImpl::
+    createGpuMemoryBuffer2DCHROMIUM(WGC3Duint image_id,
+                                    WGC3Dint width, WGC3Dint height) {
+  ClearContext();
+  gl_->CreateGpuMemoryBuffer2DCHROMIUM(image_id, width, height);
+}
+
 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*)
@@ skipping 26 matching lines @@
 
 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
     WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
     WGC3Denum, WGC3Denum, const void*)
 
 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
     WGC3Denum)
 
 }  // namespace gpu
 }  // namespace webkit