Added the Vulkan Context Provider implementation.

content/browser/compositor/gpu_process_transport_factory.cc

 // Copyright 2014 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/gpu_process_transport_factory.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "cc/base/histograms.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
+#include "cc/output/vulkan_in_process_context_provider.h"
 #include "cc/raster/single_thread_task_graph_runner.h"
 #include "cc/raster/task_graph_runner.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_display_output_surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/browser_compositor_output_surface.h"
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/gl_helper.h"
 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
 #include "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
@@ skipping 39 matching lines @@
 #elif defined(USE_X11)
 #include "content/browser/compositor/software_output_device_x11.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.h"
 #include "content/browser/compositor/software_output_device_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #elif defined(OS_ANDROID)
 #include "content/browser/compositor/browser_compositor_overlay_candidate_validator_android.h"
 #endif
 
+#if defined(ENABLE_VULKAN)
+#include "content/browser/compositor/vulkan_browser_compositor_output_surface.h"
+#endif
+
 using cc::ContextProvider;
 using gpu::gles2::GLES2Interface;
 
 namespace {
 
 const int kNumRetriesBeforeSoftwareFallback = 4;
 
 std::unique_ptr<content::WebGraphicsContext3DCommandBufferImpl>
 CreateContextCommon(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
                     gpu::SurfaceHandle surface_handle) {
@@ skipping 158 matching lines @@
     // output_surface_map_ here.
     output_surface_map_.Remove(data->surface_id);
     data->surface = nullptr;
   }
 
 #if defined(OS_WIN)
   gfx::RenderingWindowManager::GetInstance()->UnregisterParent(
       compositor->widget());
 #endif
 
-  bool create_gpu_output_surface =
+  const bool use_vulkan = SharedVulkanContextProvider();
+
+  const bool create_gpu_output_surface =
       ShouldCreateGpuOutputSurface(compositor.get());
-  if (create_gpu_output_surface) {
+  if (create_gpu_output_surface && !use_vulkan) {
     CauseForGpuLaunch cause =
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
     BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
         cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
                           callback_factory_.GetWeakPtr(), compositor,
                           create_gpu_output_surface, 0));
   } else {
     EstablishedGpuChannel(compositor, create_gpu_output_surface, 0);
   }
 }
@@ skipping 20 matching lines @@
                << "software compositing on ChromeOS.";
 #endif
     create_gpu_output_surface = false;
   }
 
 #if defined(OS_WIN)
   gfx::RenderingWindowManager::GetInstance()->RegisterParent(
       compositor->widget());
 #endif
 
+  scoped_refptr<cc::VulkanInProcessContextProvider> vulkan_context_provider =
+      SharedVulkanContextProvider();
+
   scoped_refptr<ContextProviderCommandBuffer> context_provider;
-  if (create_gpu_output_surface) {
+  if (create_gpu_output_surface && !vulkan_context_provider)  {
     // Try to reuse existing worker context provider.
     if (shared_worker_context_provider_) {
       bool lost;
       {
         // Note: If context is lost, we delete reference after releasing the
         // lock.
         base::AutoLock lock(*shared_worker_context_provider_->GetLock());
         lost = shared_worker_context_provider_->ContextGL()
                    ->GetGraphicsResetStatusKHR() != GL_NO_ERROR;
       }
@@ skipping 49 matching lines @@
           CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
       BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(
           cause, base::Bind(&GpuProcessTransportFactory::EstablishedGpuChannel,
                             callback_factory_.GetWeakPtr(), compositor,
                             create_gpu_output_surface, num_attempts + 1));
       return;
     }
   }
 
   std::unique_ptr<BrowserCompositorOutputSurface> surface;
-  if (!create_gpu_output_surface) {
+#if defined(ENABLE_VULKAN)
+  std::unique_ptr<VulkanBrowserCompositorOutputSurface> vulkan_surface;
+  if (vulkan_context_provider) {
+    vulkan_surface.reset(new VulkanBrowserCompositorOutputSurface(
+        vulkan_context_provider, compositor->vsync_manager()));
+    if (!vulkan_surface->Initialize(compositor.get()->widget())) {
+      vulkan_surface->Destroy();
+      vulkan_surface.reset();
+    }
+  }
+
+  if (vulkan_surface) {
+    surface = std::move(vulkan_surface);
+  } else
+#endif

[piman, 2016/04/19 23:42:02]

I would really prefer not to interleave compile-time #ifdefs and run-time ifs,
it makes the code really hard to read.

Maybe the surface = std::move(vulkan_surface); bit can move to an else clause on
l.391, and this else can instead be a if (!surface), outside the #ifdef?

[David Yen, 2016/04/20 17:37:38]

Done.

+      if (!create_gpu_output_surface) {
     surface = base::WrapUnique(new SoftwareBrowserCompositorOutputSurface(
         CreateSoftwareOutputDevice(compositor.get()),
         compositor->vsync_manager(), compositor->task_runner().get()));
   } else {
     DCHECK(context_provider);
     ContextProvider::Capabilities capabilities =
         context_provider->ContextCapabilities();
     if (!data->surface_id) {
       surface = base::WrapUnique(new OffscreenBrowserCompositorOutputSurface(
           context_provider, shared_worker_context_provider_,
@@ skipping 44 matching lines @@
   // SurfaceDisplayOutputSurface set up to draw to the display's surface.
   cc::SurfaceManager* manager = surface_manager_.get();
   std::unique_ptr<cc::OnscreenDisplayClient> display_client(
       new cc::OnscreenDisplayClient(
           std::move(surface), manager, HostSharedBitmapManager::current(),
           BrowserGpuMemoryBufferManager::current(),
           compositor->GetRendererSettings(), compositor->task_runner(),
           compositor->surface_id_allocator()->id_namespace()));
 
   std::unique_ptr<cc::SurfaceDisplayOutputSurface> output_surface(
-      new cc::SurfaceDisplayOutputSurface(
-          manager, compositor->surface_id_allocator(), context_provider,
-          shared_worker_context_provider_));
+#if defined(ENABLE_VULKAN)
+      vulkan_context_provider
+          ? new cc::SurfaceDisplayOutputSurface(
+                manager, compositor->surface_id_allocator(),
+                static_cast<scoped_refptr<cc::VulkanContextProvider>>(
+                    vulkan_context_provider))
+          :
+#endif

[piman, 2016/04/19 23:42:02]

Ditto. If we remove the #ifdef for the SurfaceDisplayOutputSurface constructor,
I don't think you need the #ifdef here.

[David Yen, 2016/04/20 17:37:38]

Done.

+          new cc::SurfaceDisplayOutputSurface(
+              manager, compositor->surface_id_allocator(), context_provider,
+              shared_worker_context_provider_));
   display_client->set_surface_output_surface(output_surface.get());
   output_surface->set_display_client(display_client.get());
   display_client->display()->Resize(compositor->size());
   data->display_client = std::move(display_client);
   compositor->SetOutputSurface(std::move(output_surface));
 }
 
 std::unique_ptr<ui::Reflector> GpuProcessTransportFactory::CreateReflector(
     ui::Compositor* source_compositor,
     ui::Layer* target_layer) {
@@ skipping 228 matching lines @@
 
   FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
                     observer_list_,
                     OnLostResources());
 
   // Kill things that use the shared context before killing the shared context.
   lost_gl_helper.reset();
   lost_shared_main_thread_contexts  = NULL;
 }
 
+scoped_refptr<cc::VulkanInProcessContextProvider>
+GpuProcessTransportFactory::SharedVulkanContextProvider() {
+  if (!shared_vulkan_context_provider_initialized_) {
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableVulkan)) {
+      shared_vulkan_context_provider_ =
+          cc::VulkanInProcessContextProvider::Create();
+    }
+
+    shared_vulkan_context_provider_initialized_ = true;
+  }
+  return shared_vulkan_context_provider_;
+}
+
 }  // namespace content