Implement TextureImageTransportSurface using texture mailbox

content/common/gpu/texture_image_transport_surface.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 #define CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_
 
+#include <map>

[jonathan.backer, 2012/12/04 19:15:13]

nit: necessary?

[no sievers, 2012/12/05 22:02:34]

Done.

[no sievers, 2012/12/05 22:02:34]

Done.

+
 #include "base/basictypes.h"
-#include "base/memory/weak_ptr.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/image_transport_surface.h"
+#include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
+#include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 
 namespace content {
 class GpuChannelManager;
 
 class TextureImageTransportSurface :
     public ImageTransportSurface,
     public GpuCommandBufferStub::DestructionObserver,
-    public gfx::GLSurface,
-    public base::SupportsWeakPtr<TextureImageTransportSurface> {
+    public gfx::GLSurface {
  public:
   TextureImageTransportSurface(GpuChannelManager* manager,
                                GpuCommandBufferStub* stub,
                                const gfx::GLSurfaceHandle& handle);
 
   // gfx::GLSurface implementation.
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool DeferDraws() OVERRIDE;
   virtual bool Resize(const gfx::Size& size) OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual void* GetHandle() OVERRIDE;
   virtual unsigned GetFormat() OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual void SetBackbufferAllocation(bool allocated) OVERRIDE;
   virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
   virtual void* GetShareHandle() OVERRIDE;
   virtual void* GetDisplay() OVERRIDE;
   virtual void* GetConfig() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation.
   virtual void OnBufferPresented(
-      bool presented,
+      uint64 surface_handle,
       uint32 sync_point) OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
-  virtual void OnSetFrontSurfaceIsProtected(
-      bool is_protected,
-      uint32 protection_state_id) OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
   // GpuCommandBufferStub::DestructionObserver implementation.
   virtual void OnWillDestroyStub(GpuCommandBufferStub* stub) OVERRIDE;
 
  private:
-  // A texture backing the front/back buffer in the parent stub.
+  // A texture backing the front/back buffer.
   struct Texture {
     Texture();
     ~Texture();
 
-    // The client-side id in the parent stub.
-    uint32 client_id;
-
     // The currently allocated size.
     gfx::Size size;
 
-    // Whether or not that texture has been sent to the client yet.
-    bool sent_to_client;
+    // The actual GL texture id.
+    uint32 service_id;
 
-    // The texture info in the parent stub.
-    gpu::gles2::TextureManager::TextureInfo::Ref info;
+    // The surface identifier for this texture.
+    uint64 identifier;

[jonathan.backer, 2012/12/04 19:15:13]

nit: s/identifier/surface_handle?

This would disambiguate it with other identifiers (like service_id). Plus this
is what we call it in the IPCs.

In other places you are using id instead of identifier. Maybe do this there too?

[no sievers, 2012/12/05 22:02:34]

Done.

   };
 
   virtual ~TextureImageTransportSurface();
-  void CreateBackTexture(const gfx::Size& size);
+  void CreateBackTexture();
   void AttachBackTextureToFBO();
-  void ReleaseTexture(int id);
-  void ReleaseParentStub();
+  void ReleaseBackTexture();
   void AdjustFrontBufferAllocation();
-  void BufferPresentedImpl(bool presented);
-  int front() const { return front_; }
-  int back() const { return 1 - front_; }
+  void BufferPresentedImpl(uint64 surface_handle);
+  void ProduceTexture(Texture& texture);
+  void ConsumeTexture(Texture& texture);
+
+  gpu::gles2::MailboxName& mailbox_name(uint64 id) {
+    DCHECK(id == 1 || id == 2);
+    return mailbox_names_[id-1];
+  }
 
   // The framebuffer that represents this surface (service id). Allocated lazily
   // in OnMakeCurrent.
   uint32 fbo_id_;
 
-  // The front and back buffers.
-  Texture textures_[2];
+  // The current backbuffer.
+  Texture backbuffer_;
 
-  gfx::Rect previous_damage_rect_;
-
-  // Indicates which of the 2 above is the front buffer.
-  int front_;
+  gfx::Size current_size_;

[jonathan.backer, 2012/12/04 19:15:13]

Maybe a comment on why this differs from |backbuffer_.size|? Or nix it all
together.

[no sievers, 2012/12/05 22:02:34]

Done.

 
   // Whether or not the command buffer stub has been destroyed.
   bool stub_destroyed_;
 
   bool backbuffer_suggested_allocation_;
   bool frontbuffer_suggested_allocation_;
 
-  bool frontbuffer_is_protected_;
-  uint32 protection_state_id_;
-
   scoped_ptr<ImageTransportHelper> helper_;
   gfx::GLSurfaceHandle handle_;
-  GpuCommandBufferStub* parent_stub_;
 
   // The offscreen surface used to make the context current. However note that
   // the actual rendering is always redirected to an FBO.
-  scoped_refptr<GLSurface> surface_;
+  scoped_refptr<gfx::GLSurface> surface_;
+
+  // Holds a reference to the underlying context for cleanup.
+  scoped_refptr<gfx::GLContext> context_;
 
   // Whether a SwapBuffers is pending.
   bool is_swap_buffers_pending_;
 
   // Whether we unscheduled command buffer because of pending SwapBuffers.
   bool did_unschedule_;
 
-  // Whether or not the buffer flip went through browser side on the last
-  // swap or post sub buffer.
-  bool did_flip_;
+  // The mailbox names used for texture exchange. Uses the texture
+  // identifier as the key.

[jonathan.backer, 2012/12/04 19:15:13]

nit: s/texture identifier/surface_handle?

[no sievers, 2012/12/05 22:02:34]

Done.

+  gpu::gles2::MailboxName mailbox_names_[2];
+
+  // Holds a reference to the mailbox manager for cleanup.
+  scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureImageTransportSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_TEXTURE_IMAGE_TRANSPORT_SURFACE_H_