gpu: reference target surfaces through a globally unique surface id.

content/common/gpu/image_transport_surface_mac.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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/common/gpu/image_transport_surface.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface_cgl.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/surface/io_surface_support_mac.h"
 
 namespace {
 
 // We are backed by an offscreen surface for the purposes of creating
 // a context, but use FBOs to render to texture backed IOSurface
 class IOSurfaceImageTransportSurface : public gfx::NoOpGLSurfaceCGL,
                                        public ImageTransportSurface {
  public:
   IOSurfaceImageTransportSurface(GpuChannelManager* manager,
-                                 int32 render_view_id,
-                                 int32 client_id,
-                                 int32 command_buffer_id,
+                                 GpuCommandBufferStub* stub,
                                  gfx::PluginWindowHandle handle);
 
   // GLSurface implementation
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
-  virtual void OnNewSurfaceACK(uint64 surface_id,
+  virtual void OnNewSurfaceACK(uint64 surface_handle,
                                TransportDIB::Handle shm_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~IOSurfaceImageTransportSurface() OVERRIDE;
 
   uint32 fbo_id_;
   GLuint texture_id_;
 
   base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_;
 
   // The id of |io_surface_| or 0 if that's NULL.
-  uint64 io_surface_id_;
+  uint64 io_surface_handle_;
 
   // Weak pointer to the context that this was last made current to.
   gfx::GLContext* context_;
 
   gfx::Size size_;
 
   // Whether or not we've successfully made the surface current once.
   bool made_current_;
 
   scoped_ptr<ImageTransportHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(IOSurfaceImageTransportSurface);
 };
 
 // We are backed by an offscreen surface for the purposes of creating
 // a context, but use FBOs to render to texture backed IOSurface
 class TransportDIBImageTransportSurface : public gfx::NoOpGLSurfaceCGL,
                                           public ImageTransportSurface {
  public:
   TransportDIBImageTransportSurface(GpuChannelManager* manager,
-                                    int32 render_view_id,
-                                    int32 client_id,
-                                    int32 command_buffer_id,
+                                    GpuCommandBufferStub* stub,
                                     gfx::PluginWindowHandle handle);
 
   // GLSurface implementation
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnPostSubBufferACK() OVERRIDE;
-  virtual void OnNewSurfaceACK(uint64 surface_id,
+  virtual void OnNewSurfaceACK(uint64 surface_handle,
                                TransportDIB::Handle shm_handle) OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~TransportDIBImageTransportSurface() OVERRIDE;
 
   uint32 fbo_id_;
   GLuint render_buffer_id_;
 
   scoped_ptr<TransportDIB> shared_mem_;
 
   gfx::Size size_;
 
-  static uint32 next_id_;
+  static uint32 next_handle_;
 
   // Whether or not we've successfully made the surface current once.
   bool made_current_;
 
   scoped_ptr<ImageTransportHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportDIBImageTransportSurface);
 };
 
-uint32 TransportDIBImageTransportSurface::next_id_ = 1;
+uint32 TransportDIBImageTransportSurface::next_handle_ = 1;
 
 void AddBooleanValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
                      bool value) {
   CFDictionaryAddValue(dictionary, key,
                        (value ? kCFBooleanTrue : kCFBooleanFalse));
 }
 
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
                      int32 value) {
   base::mac::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
 IOSurfaceImageTransportSurface::IOSurfaceImageTransportSurface(
     GpuChannelManager* manager,
-    int32 render_view_id,
-    int32 client_id,
-    int32 command_buffer_id,
+    GpuCommandBufferStub* stub,
     gfx::PluginWindowHandle handle)
-        : gfx::NoOpGLSurfaceCGL(gfx::Size(1, 1)),
-          fbo_id_(0),
-          texture_id_(0),
-          io_surface_id_(0),
-          context_(NULL),
-          made_current_(false) {
-  helper_.reset(new ImageTransportHelper(this,
-                                         manager,
-                                         render_view_id,
-                                         client_id,
-                                         command_buffer_id,
-                                         handle));
-
+    : gfx::NoOpGLSurfaceCGL(gfx::Size(1, 1)),
+      fbo_id_(0),
+      texture_id_(0),
+      io_surface_handle_(0),
+      context_(NULL),
+      made_current_(false) {
+  helper_.reset(new ImageTransportHelper(this, manager, stub, handle));
 }
 
 IOSurfaceImageTransportSurface::~IOSurfaceImageTransportSurface() {
   Destroy();
 }
 
 bool IOSurfaceImageTransportSurface::Initialize() {
   // Only support IOSurfaces if the GL implementation is the native desktop GL.
   // IO surfaces will not work with, for example, OSMesa software renderer
   // GL contexts.
@@ skipping 46 matching lines @@
 }
 
 unsigned int IOSurfaceImageTransportSurface::GetBackingFrameBufferObject() {
   return fbo_id_;
 }
 
 bool IOSurfaceImageTransportSurface::SwapBuffers() {
   glFlush();
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = io_surface_id_;
+  params.surface_handle = io_surface_handle_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
 bool IOSurfaceImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   glFlush();
 
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
-  params.surface_id = io_surface_id_;
+  params.surface_handle = io_surface_handle_;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
@@ skipping 11 matching lines @@
 
 void IOSurfaceImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
 void IOSurfaceImageTransportSurface::OnPostSubBufferACK() {
   helper_->SetScheduled(true);
 }
 
 void IOSurfaceImageTransportSurface::OnNewSurfaceACK(
-    uint64 surface_id,
+    uint64 surface_handle,
     TransportDIB::Handle /* shm_handle */) {
-  DCHECK_EQ(io_surface_id_, surface_id);
+  DCHECK_EQ(io_surface_handle_, surface_handle);
   helper_->SetScheduled(true);
 }
 
 void IOSurfaceImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 void IOSurfaceImageTransportSurface::OnResize(gfx::Size size) {
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
 
@@ skipping 60 matching lines @@
       static_cast<CGLContextObj>(context_->GetHandle()),
       target,
       GL_RGBA,
       size_.width(),
       size_.height(),
       GL_BGRA,
       GL_UNSIGNED_INT_8_8_8_8_REV,
       io_surface_.get(),
       plane);
 
-  io_surface_id_ = io_surface_support->IOSurfaceGetID(io_surface_);
+  io_surface_handle_ = io_surface_support->IOSurfaceGetID(io_surface_);
   glFlush();
 
   glBindTexture(target, previous_texture_id);
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, previous_fbo_id);
 
   GpuHostMsg_AcceleratedSurfaceNew_Params params;
   params.width = size_.width();
   params.height = size_.height();
-  params.surface_id = io_surface_id_;
+  params.surface_handle = io_surface_handle_;
   params.create_transport_dib = false;
   helper_->SendAcceleratedSurfaceNew(params);
 
   helper_->SetScheduled(false);
 }
 
 TransportDIBImageTransportSurface::TransportDIBImageTransportSurface(
     GpuChannelManager* manager,
-    int32 render_view_id,
-    int32 client_id,
-    int32 command_buffer_id,
+    GpuCommandBufferStub* stub,
     gfx::PluginWindowHandle handle)
         : gfx::NoOpGLSurfaceCGL(gfx::Size(1, 1)),
           fbo_id_(0),
           render_buffer_id_(0),
           made_current_(false) {
-  helper_.reset(new ImageTransportHelper(this,
-                                         manager,
-                                         render_view_id,
-                                         client_id,
-                                         command_buffer_id,
-                                         handle));
+  helper_.reset(new ImageTransportHelper(this, manager, stub, handle));
 
 }
 
 TransportDIBImageTransportSurface::~TransportDIBImageTransportSurface() {
   Destroy();
 }
 
 bool TransportDIBImageTransportSurface::Initialize() {
   if (!helper_->Initialize())
     return false;
@@ skipping 55 matching lines @@
   glReadPixels(0, 0,
                size_.width(), size_.height(),
                GL_BGRA,  // This pixel format should have no conversion.
                GL_UNSIGNED_INT_8_8_8_8_REV,
                shared_mem_->memory());
   glPixelStorei(GL_PACK_ALIGNMENT, current_alignment);
 
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, previous_fbo_id);
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = next_id_;
+  params.surface_handle = next_handle_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
 bool TransportDIBImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
@@ skipping 16 matching lines @@
                GL_BGRA,  // This pixel format should have no conversion.
                GL_UNSIGNED_INT_8_8_8_8_REV,
                &buffer[(x + y * size_.width()) * 4]);
 
   glPixelStorei(GL_PACK_ALIGNMENT, current_alignment);
   glPixelStorei(GL_PACK_ROW_LENGTH, current_pack_row_length);
 
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, previous_fbo_id);
 
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
-  params.surface_id = next_id_;
+  params.surface_handle = next_handle_;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
   helper_->SetScheduled(false);
   return true;
 }
 
@@ skipping 11 matching lines @@
 
 void TransportDIBImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
 void TransportDIBImageTransportSurface::OnPostSubBufferACK() {
   helper_->SetScheduled(true);
 }
 
 void TransportDIBImageTransportSurface::OnNewSurfaceACK(
-    uint64 surface_id,
+    uint64 surface_handle,
     TransportDIB::Handle shm_handle) {
   helper_->SetScheduled(true);
 
   shared_mem_.reset(TransportDIB::Map(shm_handle));
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 }
 
 void TransportDIBImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
@@ skipping 20 matching lines @@
                                GL_COLOR_ATTACHMENT0_EXT,
                                GL_RENDERBUFFER_EXT,
                                render_buffer_id_);
 
   glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, previous_renderbuffer_id);
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, previous_fbo_id);
 
   GpuHostMsg_AcceleratedSurfaceNew_Params params;
   params.width = size_.width();
   params.height = size_.height();
-  params.surface_id = next_id_++;
+  params.surface_handle = next_handle_++;
   params.create_transport_dib = true;
   helper_->SendAcceleratedSurfaceNew(params);
 
   helper_->SetScheduled(false);
 }
 
 }  // namespace
 
 // static
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
-    int32 render_view_id,
-    int32 client_id,
-    int32 command_buffer_id,
+    GpuCommandBufferStub* stub,
     gfx::PluginWindowHandle handle) {
   scoped_refptr<gfx::GLSurface> surface;
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
 
   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationDesktopGL:
     case gfx::kGLImplementationAppleGL:
       if (!io_surface_support) {
-        surface = new TransportDIBImageTransportSurface(manager,
-                                                        render_view_id,
-                                                        client_id,
-                                                        command_buffer_id,
-                                                        handle);
+        surface = new TransportDIBImageTransportSurface(manager, stub, handle);
       } else {
-        surface = new IOSurfaceImageTransportSurface(manager,
-                                                     render_view_id,
-                                                     client_id,
-                                                     command_buffer_id,
-                                                     handle);
+        surface = new IOSurfaceImageTransportSurface(manager, stub, handle);
       }
       break;
     default:
       NOTREACHED();
       return NULL;
   }
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // defined(USE_GPU)