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
@@ skipping 15 matching lines @@
 #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/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;
@@ skipping 88 matching lines @@
   Error GetError();
 
   // Return true if GPU process reported GLInProcessContext lost or there was a
   // problem communicating with the GPU process.
   bool IsCommandBufferContextLost();
 
   CommandBufferService* GetCommandBufferService();
 
   ::gpu::gles2::GLES2Decoder* GetDecoder();
 
+  ::gpu::gles2::ImageManager* GetImageManager();
+
  private:
   explicit GLInProcessContext(bool share_resources);
 
   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();
@@ skipping 222 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 1239 matching lines @@
 WebGLId WebGraphicsContext3DInProcessCommandBufferImpl::createTexture() {
   ClearContext();
   GLuint o;
   gl_->GenTextures(1, &o);
   return o;
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteBuffer(
     WebGLId buffer) {
   ClearContext();
+  // It is safe to call this method even though the buffer being deleted
+  // isn't a GPU memory buffer as it eventually translates to a
+  // hash_map::erase() which doesn't throw an exception if the key
+  // isn't in the hash_map
+  DeleteImageForGpuMemoryBuffer(buffer);
   gl_->DeleteBuffers(1, &buffer);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteFramebuffer(
     WebGLId framebuffer) {
   ClearContext();
   gl_->DeleteFramebuffers(1, &framebuffer);
 }
 
 void WebGraphicsContext3DInProcessCommandBufferImpl::deleteProgram(
@@ skipping 113 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::
+    CreateImageForGpuMemoryBuffer(WGC3Dsizei width, WGC3Dsizei height) {
+  gl_->Flush();
+  gfx::GpuMemoryBufferHandle buffer =
+      const_cast<GLubyte*>(
+          gl_->GetString(GL_BOUND_GPU_MEMORY_BUFFER_CHROMIUM_POINTER));
+  DCHECK(buffer);
+
+  scoped_refptr<gfx::GLImage> gl_image =
+      gfx::GLImage::CreateGLImageForGpuMemoryBuffer(
+          buffer, gfx::Size(width, height));
+
+  GLint buffer_id = 0;
+  gl_->GetIntegerv(GL_BOUND_GPU_MEMORY_BUFFER_CHROMIUM, &buffer_id);
+  DCHECK(buffer_id != 0);
+  context_->GetImageManager()->AddImage(gl_image, buffer_id);
+}
+
+void WebGraphicsContext3DInProcessCommandBufferImpl::
+    DeleteImageForGpuMemoryBuffer() {
+  gl_->Flush();
+  GLint buffer_id = 0;
+  gl_->GetIntegerv(GL_BOUND_GPU_MEMORY_BUFFER_CHROMIUM, &buffer_id);
+  DCHECK(buffer_id != 0);
+  context_->GetImageManager()->RemoveImage(buffer_id);
+}
+
+void WebGraphicsContext3DInProcessCommandBufferImpl::
+    DeleteImageForGpuMemoryBuffer(WebGLId buffer_id) {
+  gl_->Flush();
+  context_->GetImageManager()->RemoveImage(buffer_id);
+}
+
+void WebGraphicsContext3DInProcessCommandBufferImpl::imageBufferDataCHROMIUM(
+    WGC3Denum target, WGC3Dsizei width, WGC3Dsizei height) {
+  ClearContext();
+  gl_->ImageBufferDataCHROMIUM(target, width, height);
+  if (width == 0 && height == 0) {
+    DeleteImageForGpuMemoryBuffer();
+  } else {
+    CreateImageForGpuMemoryBuffer(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*)
 
 DELEGATE_TO_GL_2(drawBuffersEXT, DrawBuffersEXT,
                  WGC3Dsizei, const WGC3Denum*)
 
 DELEGATE_TO_GL_9(asyncTexImage2DCHROMIUM, AsyncTexImage2DCHROMIUM,
     WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dint,
     WGC3Denum, WGC3Denum, const void*)
 
 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