SurfacelessSurfaces for Mus

components/mus/surfaces/buffer_queue.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 "content/browser/compositor/buffer_queue.h"
+#include "components/mus/surfaces/buffer_queue.h"
 
 #include "base/containers/adapters.h"
-#include "base/memory/ptr_util.h"
-#include "build/build_config.h"
-#include "content/browser/compositor/gl_helper.h"
-#include "content/browser/compositor/image_transport_factory.h"
-#include "content/common/gpu/client/context_provider_command_buffer.h"
+#include "cc/output/context_provider.h"
+#include "components/mus/gles2/gl_helper.h"
+#include "components/mus/gles2/ozone_gpu_memory_buffer.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
-#include "gpu/command_buffer/service/image_factory.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/skia_util.h"
 
-namespace content {
+namespace mus {
 
 BufferQueue::BufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
                          unsigned int texture_target,
                          unsigned int internalformat,
-                         GLHelper* gl_helper,
-                         gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-                         int surface_id)
+                         gfx::AcceleratedWidget widget)
     : context_provider_(context_provider),
       fbo_(0),
       allocated_count_(0),
       texture_target_(texture_target),
       internal_format_(internalformat),
-      gl_helper_(gl_helper),
-      gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
-      surface_id_(surface_id) {}
+      widget_(widget) {}
 
 BufferQueue::~BufferQueue() {
   FreeAllSurfaces();
 
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   if (fbo_)
     gl->DeleteFramebuffers(1, &fbo_);
 }
 
 void BufferQueue::Initialize() {
+  DCHECK(context_provider_);
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
+  DCHECK(gl);
   gl->GenFramebuffers(1, &fbo_);
 }
 
 void BufferQueue::BindFramebuffer() {
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
 
   if (!current_surface_)
     current_surface_ = GetNextSurface();
 
   if (current_surface_) {
     gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                              texture_target_, current_surface_->texture, 0);
   }
 }
 
 void BufferQueue::CopyBufferDamage(int texture,
                                    int source_texture,
                                    const gfx::Rect& new_damage,
                                    const gfx::Rect& old_damage) {
-  gl_helper_->CopySubBufferDamage(
-      texture_target_, texture, source_texture,
-      SkRegion(gfx::RectToSkIRect(new_damage)),
-      SkRegion(gfx::RectToSkIRect(old_damage)));
+  GLCopySubBufferDamage(context_provider_->ContextGL(), texture_target_,
+                        texture, source_texture,
+                        SkRegion(gfx::RectToSkIRect(new_damage)),
+                        SkRegion(gfx::RectToSkIRect(old_damage)));
 }
 
 void BufferQueue::UpdateBufferDamage(const gfx::Rect& damage) {
   if (displayed_surface_)
     displayed_surface_->damage.Union(damage);
   for (auto& surface : available_surfaces_)
     surface->damage.Union(damage);
   for (auto& surface : in_flight_surfaces_) {
     if (surface)
       surface->damage.Union(damage);
@@ skipping 26 matching lines @@
   UpdateBufferDamage(damage);
   in_flight_surfaces_.push_back(std::move(current_surface_));
   // Some things reset the framebuffer (CopySubBufferDamage, some GLRenderer
   // paths), so ensure we restore it here.
   context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
 }
 
 void BufferQueue::Reshape(const gfx::Size& size, float scale_factor) {
   if (size == size_)
     return;
-  // TODO(ccameron): This assert is being hit on Mac try jobs. Determine if that
-  // is cause for concern or if it is benign.
-  // http://crbug.com/524624
-#if !defined(OS_MACOSX)
-  DCHECK(!current_surface_);
-#endif
+
   size_ = size;
 
   // TODO: add stencil buffer when needed.
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
   gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                            texture_target_, 0, 0);
 
   FreeAllSurfaces();
 }
@@ skipping 14 matching lines @@
 
   if (current_surface_) {
     // If we have a texture bound, we will need to re-bind it.
     gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
     gl->BindFramebuffer(GL_FRAMEBUFFER, fbo_);
     gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                              texture_target_, current_surface_->texture, 0);
   }
 }
 
-std::unique_ptr<BufferQueue::AllocatedSurface> BufferQueue::RecreateBuffer(
-    std::unique_ptr<AllocatedSurface> surface) {
+scoped_ptr<BufferQueue::AllocatedSurface> BufferQueue::RecreateBuffer(

[Fady Samuel, 2016/04/12 02:54:40]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

+    scoped_ptr<AllocatedSurface> surface) {

[Fady Samuel, 2016/04/12 02:54:40]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

   if (!surface)
     return nullptr;
 
-  std::unique_ptr<AllocatedSurface> new_surface(GetNextSurface());
+  scoped_ptr<AllocatedSurface> new_surface(GetNextSurface());

[Fady Samuel, 2016/04/12 02:54:41]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

   if (!new_surface)
     return nullptr;
 
   new_surface->damage = surface->damage;
 
   // Copy the entire texture.
   CopyBufferDamage(new_surface->texture, surface->texture, gfx::Rect(),
                    gfx::Rect(size_));
   return new_surface;
 }
@@ skipping 17 matching lines @@
 }
 
 void BufferQueue::FreeSurfaceResources(AllocatedSurface* surface) {
   if (!surface->texture)
     return;
 
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->BindTexture(texture_target_, surface->texture);
   gl->ReleaseTexImage2DCHROMIUM(texture_target_, surface->image);
   gl->DeleteTextures(1, &surface->texture);
+  // TODO(rjk): Implement image deletion.
   gl->DestroyImageCHROMIUM(surface->image);
   surface->buffer.reset();
   allocated_count_--;
 }
 
-std::unique_ptr<BufferQueue::AllocatedSurface> BufferQueue::GetNextSurface() {
+scoped_ptr<BufferQueue::AllocatedSurface> BufferQueue::GetNextSurface() {

[Fady Samuel, 2016/04/12 02:54:40]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

   if (!available_surfaces_.empty()) {
-    std::unique_ptr<AllocatedSurface> surface =
+    scoped_ptr<AllocatedSurface> surface =

[Fady Samuel, 2016/04/12 02:54:40]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

         std::move(available_surfaces_.back());
     available_surfaces_.pop_back();
     return surface;
   }
 
   unsigned int texture = 0;
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->GenTextures(1, &texture);
   if (!texture)
     return nullptr;
 
   // We don't want to allow anything more than triple buffering.
   DCHECK_LT(allocated_count_, 4U);
 
-  std::unique_ptr<gfx::GpuMemoryBuffer> buffer(
-      gpu_memory_buffer_manager_->AllocateGpuMemoryBuffer(
+  scoped_ptr<gfx::GpuMemoryBuffer> buffer(

[Fady Samuel, 2016/04/12 02:54:41]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

+      OzoneGpuMemoryBuffer::CreateOzoneGpuMemoryBuffer(
           size_, gpu::DefaultBufferFormatForImageFormat(internal_format_),
-          gfx::BufferUsage::SCANOUT, surface_id_));
+          gfx::BufferUsage::SCANOUT, widget_));
+
   if (!buffer.get()) {
     gl->DeleteTextures(1, &texture);
     DLOG(ERROR) << "Failed to allocate GPU memory buffer";
     return nullptr;
   }
 
-  unsigned int id = gl->CreateImageCHROMIUM(
-      buffer->AsClientBuffer(), size_.width(), size_.height(),
-      internal_format_);
+  // Thanks to the convolutions of Chrome source code, this ends up calling back
+  // into the CommandBufferLocal via
+  // its implementation of the GpuControl interface. In that case, we need to

[Fady Samuel, 2016/04/12 02:54:40]

nit: weird wrapping.

[rjkroege, 2016/04/12 19:27:54]

Done.

+  // handle the given buffer pointer there.
+  unsigned int id =
+      gl->CreateImageCHROMIUM(buffer->AsClientBuffer(), size_.width(),
+                              size_.height(), internal_format_);
   if (!id) {
     LOG(ERROR) << "Failed to allocate backing image surface";
     gl->DeleteTextures(1, &texture);
     return nullptr;
   }
 
   allocated_count_++;
   gl->BindTexture(texture_target_, texture);
   gl->BindTexImage2DCHROMIUM(texture_target_, id);
-  return base::WrapUnique(new AllocatedSurface(this, std::move(buffer), texture,
-                                               id, gfx::Rect(size_)));
+  // It doesn't end up in the queue to re-use until we handle the page flip.
+  return make_scoped_ptr(new AllocatedSurface(this, std::move(buffer), texture,

[Fady Samuel, 2016/04/12 02:54:41]

WrapUnique

[rjkroege, 2016/04/12 19:27:54]

Done.

+                                              id, gfx::Rect(size_)));
 }
 
 BufferQueue::AllocatedSurface::AllocatedSurface(
     BufferQueue* buffer_queue,
-    std::unique_ptr<gfx::GpuMemoryBuffer> buffer,
+    scoped_ptr<gfx::GpuMemoryBuffer> buffer,

[Fady Samuel, 2016/04/12 02:54:40]

nit: std::unique_ptr.

[rjkroege, 2016/04/12 19:27:54]

Done.

     unsigned int texture,
     unsigned int image,
     const gfx::Rect& rect)
     : buffer_queue(buffer_queue),
       buffer(buffer.release()),
       texture(texture),
       image(image),
       damage(rect) {}
 
 BufferQueue::AllocatedSurface::~AllocatedSurface() {
   buffer_queue->FreeSurfaceResources(this);
 }
 
-}  // namespace content
+}  // namespace mus