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"
@@ skipping 60 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 "cc/output/vulkan_derived_context_provider.h"
+#include "cc/output/vulkan_in_process_context_provider.h"
+#include "content/browser/compositor/vulkan_browser_compositor_output_surface.h"
+#endif
+
 using cc::ContextProvider;
 using gpu::gles2::GLES2Interface;
 
 static const int kNumRetriesBeforeSoftwareFallback = 4;
 
 namespace content {
 
 struct GpuProcessTransportFactory::PerCompositorData {
   int surface_id;
   BrowserCompositorOutputSurface* surface;
@@ skipping 125 matching lines @@
     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 =
+#if defined(ENABLE_VULKAN)
+      !SharedVulkanContextProvider() &&
+#endif

[piman, 2016/04/19 01:36:42]

create_gpu_output_surface really means "don't fallback to software", maybe let's
keep it that way? We can have a separate use_vulkan bool, that we'd check on
l.236 (if using vulkan, no need to start a GPU process).

Separately, it would be good to leave vulkan as a run-time option, so that if
it's compiled in, we can still compare GL vs Vulkan (may be useful for
benchmarking). So it would look like
bool use_vulkan =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableVulkan) &&
SharedVulkanContextProvider();

It also means the rest of the code doesn't need to have all the ifdefs.

[David Yen, 2016/04/19 22:20:28]

Seems we need to check the switch everytime SharedVulkanContextProvider() is
going to be used, perhaps just build it into there?

       ShouldCreateGpuOutputSurface(compositor.get());
   if (create_gpu_output_surface) {
     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 82 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)
+  scoped_refptr<cc::VulkanInProcessContextProvider> vulkan_context_provider =
+      SharedVulkanContextProvider();
+  if (vulkan_context_provider) {
+    surface = make_scoped_ptr(new VulkanBrowserCompositorOutputSurface(
+        cc::VulkanDerivedContextProvider::Create(vulkan_context_provider,
+                                                 compositor.get()->widget()),
+        compositor->vsync_manager()));
+  } else
+#endif
+      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
+          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 270 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;
 }
 
+#if defined(ENABLE_VULKAN)
+scoped_refptr<cc::VulkanInProcessContextProvider>
+GpuProcessTransportFactory::SharedVulkanContextProvider() {
+  if (!shared_vulkan_context_provider_initialized_) {
+    shared_vulkan_context_provider_ =
+        cc::VulkanInProcessContextProvider::Create();
+    if (!shared_vulkan_context_provider_->Initialize())
+      shared_vulkan_context_provider_ = nullptr;
+
+    shared_vulkan_context_provider_initialized_ = true;
+  }
+  return shared_vulkan_context_provider_;
+}
+#endif
+
 }  // namespace content