Add support for OutputSurface for Vulkan on Android.

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 0c8c5b4316637176f943c74276088997fe5f868e..d39f494ae4e3c8a381cc7aba9ba56e86d4713ce6 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -35,6 +35,7 @@
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
+#include "cc/output/vulkan_in_process_context_provider.h"
 #include "cc/raster/single_thread_task_graph_runner.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/onscreen_display_client.h"
@@ -62,6 +63,7 @@
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
+#include "gpu/vulkan/vulkan_surface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
@@ -69,6 +71,10 @@
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/swap_result.h"
 
+namespace gpu {
+class VulkanSurface;

[David Yen, 2016/05/02 18:44:10]

nit: This is not necessary since you included the header.

[sohanjg, 2016/05/04 05:19:26]

Done.

+}
+
 namespace content {
 
 namespace {
@@ -221,6 +227,57 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface,
   std::unique_ptr<ExternalBeginFrameSource> begin_frame_source_;
 };
 
+#if defined(ENABLE_VULKAN)
+class VulkanOutputSurface : public cc::OutputSurface {
+ public:
+  VulkanOutputSurface(
+      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider)
+      : OutputSurface(nullptr,
+                      nullptr,
+                      std::move(vulkan_context_provider),
+                      nullptr) {}
+
+  ~VulkanOutputSurface() override { Destroy(); }
+
+  bool Initialize(gfx::AcceleratedWidget widget) {
+    DCHECK(!surface_);
+    std::unique_ptr<gpu::VulkanSurface> surface(
+        gpu::VulkanSurface::CreateViewSurface(widget));
+    if (!surface->Initialize(vulkan_context_provider()->GetDeviceQueue(),
+                             gpu::VulkanSurface::DEFAULT_SURFACE_FORMAT)) {
+      return false;
+    }
+    surface_ = std::move(surface);
+
+    return true;
+  }
+
+  void SwapBuffers(cc::CompositorFrame* frame) override {
+    surface_->SwapBuffers();
+    PostSwapBuffersComplete();
+    client_->DidSwapBuffers();
+  }
+
+  void Destroy() {
+    if (surface_) {
+      surface_->Destroy();
+      surface_.reset();
+    }
+  }
+
+  void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
+                              gfx::SwapResult result) {
+    RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
+    OutputSurface::OnSwapBuffersComplete();
+  }
+
+ private:
+  std::unique_ptr<gpu::VulkanSurface> surface_;
+
+  DISALLOW_COPY_AND_ASSIGN(VulkanOutputSurface);
+};
+#endif
+
 static bool g_initialized = false;
 
 base::LazyInstance<cc::SurfaceManager> g_surface_manager =
@@ -293,6 +350,7 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
       num_successive_context_creation_failures_(0),
       output_surface_request_pending_(false),
       needs_begin_frames_(false),
+      shared_vulkan_context_provider_android_(NULL),
       weak_factory_(this) {
   DCHECK(client);
   DCHECK(root_window);
@@ -507,86 +565,109 @@ void CompositorImpl::CreateOutputSurface() {
   if (!output_surface_request_pending_ || !host_->visible())
     return;
 
-  // This is used for the browser compositor (offscreen) and for the display
-  // compositor (onscreen), so ask for capabilities needed by either one.
-  // The default framebuffer for an offscreen context is not used, so it does
-  // not need alpha, stencil, depth, antialiasing. The display compositor does
-  // not use these things either, except for alpha when it has a transparent
-  // background.
-  gpu::gles2::ContextCreationAttribHelper attributes;
-  attributes.alpha_size = -1;
-  attributes.stencil_size = 0;
-  attributes.depth_size = 0;
-  attributes.samples = 0;
-  attributes.sample_buffers = 0;
-  attributes.bind_generates_resource = false;
-
-  if (has_transparent_background_) {
-    attributes.alpha_size = 8;
-  } else if (base::SysInfo::IsLowEndDevice()) {
-    // In this case we prefer to use RGB565 format instead of RGBA8888 if
-    // possible.
-    // TODO(danakj): GpuCommandBufferStub constructor checks for alpha == 0 in
-    // order to enable 565, but it should avoid using 565 when -1s are specified
-    // (IOW check that a <= 0 && rgb > 0 && rgb <= 565) then alpha should be -1.
-    attributes.alpha_size = 0;
-    attributes.red_size = 5;
-    attributes.green_size = 6;
-    attributes.blue_size = 5;
+  scoped_refptr<ContextProviderCommandBuffer> context_provider;
+  scoped_refptr<cc::VulkanInProcessContextProvider> vulkan_context_provider =
+      SharedVulkanContextProviderAndroid();
+  std::unique_ptr<cc::OutputSurface> real_output_surface;
+#if defined(ENABLE_VULKAN)
+  std::unique_ptr<VulkanOutputSurface> vulkan_surface;
+  if (vulkan_context_provider) {
+    vulkan_surface.reset(
+        new VulkanOutputSurface(std::move(vulkan_context_provider)));
+    if (!vulkan_surface->Initialize(window_)) {
+      vulkan_surface->Destroy();
+      vulkan_surface.reset();
+    } else {
+      real_output_surface = std::move(vulkan_surface);
+    }
   }
+#endif
 
-  pending_swapbuffers_ = 0;
+  if (!real_output_surface) {
+    // This is used for the browser compositor (offscreen) and for the display
+    // compositor (onscreen), so ask for capabilities needed by either one.
+    // The default framebuffer for an offscreen context is not used, so it does
+    // not need alpha, stencil, depth, antialiasing. The display compositor does
+    // not use these things either, except for alpha when it has a transparent
+    // background.
+    gpu::gles2::ContextCreationAttribHelper attributes;
+    attributes.alpha_size = -1;
+    attributes.stencil_size = 0;
+    attributes.depth_size = 0;
+    attributes.samples = 0;
+    attributes.sample_buffers = 0;
+    attributes.bind_generates_resource = false;
+
+    if (has_transparent_background_) {
+      attributes.alpha_size = 8;
+    } else if (base::SysInfo::IsLowEndDevice()) {
+      // In this case we prefer to use RGB565 format instead of RGBA8888 if
+      // possible.
+      // TODO(danakj): GpuCommandBufferStub constructor checks for alpha == 0 in
+      // order to enable 565, but it should avoid using 565 when -1s are
+      // specified
+      // (IOW check that a <= 0 && rgb > 0 && rgb <= 565) then alpha should be
+      // -1.
+      attributes.alpha_size = 0;
+      attributes.red_size = 5;
+      attributes.green_size = 6;
+      attributes.blue_size = 5;
+    }
 
-  DCHECK(window_);
-  DCHECK(surface_id_);
+    pending_swapbuffers_ = 0;
 
-  BrowserGpuChannelHostFactory* factory =
-      BrowserGpuChannelHostFactory::instance();
-  // This channel might be lost (and even if it isn't right now, it might
-  // still get marked as lost from the IO thread, at any point in time really).
-  // But from here on just try and always lead to either
-  // DidInitializeOutputSurface() or DidFailToInitializeOutputSurface().
-  scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(factory->GetGpuChannel());
-
-  GURL url("chrome://gpu/CompositorImpl::CreateOutputSurface");
-  gpu::SurfaceHandle surface_handle =
-      GpuSurfaceTracker::Get()->GetSurfaceHandle(surface_id_);
-  constexpr bool share_resources = false;
-  constexpr bool automatic_flushes = false;
-
-  constexpr size_t kBytesPerPixel = 4;
-  const size_t full_screen_texture_size_in_bytes =
-      gfx::DeviceDisplayInfo().GetDisplayHeight() *
-      gfx::DeviceDisplayInfo().GetDisplayWidth() * kBytesPerPixel;
-
-  gpu::SharedMemoryLimits limits;
-  // This limit is meant to hold the contents of the display compositor
-  // drawing the scene. See discussion here:
-  // https://codereview.chromium.org/1900993002/diff/90001/content/browser/renderer_host/compositor_impl_android.cc?context=3&column_width=80&tab_spaces=8
-  limits.command_buffer_size = 64 * 1024;
-  // These limits are meant to hold the uploads for the browser UI without
-  // any excess space.
-  limits.start_transfer_buffer_size = 64 * 1024;
-  limits.min_transfer_buffer_size = 64 * 1024;
-  limits.max_transfer_buffer_size = full_screen_texture_size_in_bytes;
-  // Texture uploads may use mapped memory so give a reasonable limit for them.
-  limits.mapped_memory_reclaim_limit = full_screen_texture_size_in_bytes;
-
-  scoped_refptr<ContextProviderCommandBuffer> context_provider(
-      new ContextProviderCommandBuffer(
-          base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
-              surface_handle, url, gpu_channel_host.get(), attributes,
-              gfx::PreferIntegratedGpu, share_resources, automatic_flushes,
-              nullptr)),
-          limits, DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT));
-  DCHECK(context_provider.get());
-
-  std::unique_ptr<cc::OutputSurface> real_output_surface(
-      new OutputSurfaceWithoutParent(
-          this, context_provider,
-          base::Bind(&CompositorImpl::PopulateGpuCapabilities,
-                     base::Unretained(this)),
-          base::WrapUnique(new ExternalBeginFrameSource(this))));
+    DCHECK(window_);
+    DCHECK(surface_id_);
+
+    BrowserGpuChannelHostFactory* factory =
+        BrowserGpuChannelHostFactory::instance();
+    // This channel might be lost (and even if it isn't right now, it might
+    // still get marked as lost from the IO thread, at any point in time
+    // really).
+    // But from here on just try and always lead to either
+    // DidInitializeOutputSurface() or DidFailToInitializeOutputSurface().
+    scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(
+        factory->GetGpuChannel());
+
+    GURL url("chrome://gpu/CompositorImpl::CreateOutputSurface");
+    gpu::SurfaceHandle surface_handle =
+        GpuSurfaceTracker::Get()->GetSurfaceHandle(surface_id_);
+    constexpr bool share_resources = false;
+    constexpr bool automatic_flushes = false;
+
+    constexpr size_t kBytesPerPixel = 4;
+    const size_t full_screen_texture_size_in_bytes =
+        gfx::DeviceDisplayInfo().GetDisplayHeight() *
+        gfx::DeviceDisplayInfo().GetDisplayWidth() * kBytesPerPixel;
+
+    gpu::SharedMemoryLimits limits;
+    // This limit is meant to hold the contents of the display compositor
+    // drawing the scene. See discussion here:
+    // https://codereview.chromium.org/1900993002/diff/90001/content/browser/renderer_host/compositor_impl_android.cc?context=3&column_width=80&tab_spaces=8
+    limits.command_buffer_size = 64 * 1024;
+    // These limits are meant to hold the uploads for the browser UI without
+    // any excess space.
+    limits.start_transfer_buffer_size = 64 * 1024;
+    limits.min_transfer_buffer_size = 64 * 1024;
+    limits.max_transfer_buffer_size = full_screen_texture_size_in_bytes;
+    // Texture uploads may use mapped memory so give a reasonable limit for
+    // them.
+    limits.mapped_memory_reclaim_limit = full_screen_texture_size_in_bytes;
+
+    context_provider = new ContextProviderCommandBuffer(
+        base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
+            surface_handle, url, gpu_channel_host.get(), attributes,
+            gfx::PreferIntegratedGpu, share_resources, automatic_flushes,
+            nullptr)),
+        limits, DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT);
+    DCHECK(context_provider.get());
+
+    real_output_surface = base::WrapUnique(new OutputSurfaceWithoutParent(
+        this, context_provider,
+        base::Bind(&CompositorImpl::PopulateGpuCapabilities,
+                   base::Unretained(this)),
+        base::WrapUnique(new ExternalBeginFrameSource(this))));
+  }
 
   cc::SurfaceManager* manager = GetSurfaceManager();
   display_client_.reset(new cc::OnscreenDisplayClient(
@@ -595,9 +676,16 @@ void CompositorImpl::CreateOutputSurface() {
       BrowserGpuMemoryBufferManager::current(),
       host_->settings().renderer_settings, base::ThreadTaskRunnerHandle::Get(),
       surface_id_allocator_->id_namespace()));
+
   std::unique_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
-      new cc::SurfaceDisplayOutputSurface(manager, surface_id_allocator_.get(),
-                                          context_provider, nullptr));
+      vulkan_context_provider
+          ? new cc::SurfaceDisplayOutputSurface(
+                manager, surface_id_allocator_.get(),
+                static_cast<scoped_refptr<cc::VulkanContextProvider>>(
+                    vulkan_context_provider))
+          : new cc::SurfaceDisplayOutputSurface(manager,
+                                                surface_id_allocator_.get(),
+                                                context_provider, nullptr));
 
   display_client_->set_surface_output_surface(surface_output_surface.get());
   surface_output_surface->set_display_client(display_client_.get());
@@ -690,4 +778,16 @@ void CompositorImpl::SetNeedsAnimate() {
   host_->SetNeedsAnimate();
 }
 
+scoped_refptr<cc::VulkanInProcessContextProvider>
+CompositorImpl::SharedVulkanContextProviderAndroid() {

[piman, 2016/05/02 22:19:43]

I don't think this shares anything across CompositorImpls, unless it's static,
and shared_vulkan_context_provider_android_ is static too.
Keep in mind that 
shared_vulkan_context_provider_android_ can't be a global scoped_refptr (non-POD
type), so you may want to use a LazyInstance or something.

[sohanjg, 2016/05/03 12:38:53]

Hmm, if we are to make a lazyinstance (leaky or otherwise) of
shared_vulkan_context_provider_android_, then we have to expose the ctor dtor
publicly in VulkanInProcessContextProvider, and lose the ref-countedness? Is
that ok ?

Would we need to change GpuProcessTransportFactory's 
shared_vulkan_context_provider_ too ? 

[piman, 2016/05/03 14:53:26]

I was thinking LazyInstance<scoped_refptr<VulkanInProcessContextProvider>>
GpuProcessTransportFactory is already a singleton, which is shared among the
compositors.

[sohanjg, 2016/05/04 05:19:26]

Done.

I was trying to use the cxt provider w/o scopedness.

+  if (!shared_vulkan_context_provider_android_) {
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableVulkan)) {
+      shared_vulkan_context_provider_android_ =
+          cc::VulkanInProcessContextProvider::Create();
+    }
+  }
+  return shared_vulkan_context_provider_android_;
+}
+
 }  // namespace content