Added the Vulkan Context Provider implementation.

content/renderer/render_widget.cc

 // 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.
 
 #include "content/renderer/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_synthetic_delay.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/output_surface.h"
+#include "cc/output/vulkan_in_process_context_provider.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/trees/layer_tree_host.h"
 #include "components/scheduler/renderer/render_widget_scheduling_state.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu_process_launch_causes.h"
 #include "content/common/input/synthetic_gesture_packet.h"
 #include "content/common/input/web_input_event_traits.h"
@@ skipping 61 matching lines @@
 #include "ipc/ipc_channel_posix.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #if defined(MOJO_SHELL_CLIENT)
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #endif
 
-#if defined(ENABLE_VULKAN)
-#include "cc/output/vulkan_in_process_context_provider.h"
-#endif
-
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 using blink::WebCompositionUnderline;
 using blink::WebCursorInfo;
 using blink::WebDeviceEmulationParams;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebInputEventResult;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
@@ skipping 633 matching lines @@
     if (!gpu_channel_host) {
       // Cause the compositor to wait and try again.
       return nullptr;
     }
     // We may get a valid channel, but with a software renderer. In that case,
     // disable GPU compositing.
     if (gpu_channel_host->gpu_info().software_rendering)
       use_software = true;
   }
 
-#if defined(ENABLE_VULKAN)
   scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider;
-#endif
   scoped_refptr<ContextProviderCommandBuffer> context_provider;
   scoped_refptr<ContextProviderCommandBuffer> worker_context_provider;
   if (!use_software) {
-#if defined(ENABLE_VULKAN)
-    vulkan_context_provider = cc::VulkanInProcessContextProvider::Create();
-    if (vulkan_context_provider) {
-      uint32_t output_surface_id = next_output_surface_id_++;
-      return base::WrapUnique(new DelegatedCompositorOutputSurface(
-          routing_id(), output_surface_id, context_provider,
-          worker_context_provider, vulkan_context_provider,
-          frame_swap_message_queue_));
+    if (command_line.HasSwitch(switches::kEnableVulkan)) {
+      vulkan_context_provider = cc::VulkanInProcessContextProvider::Create();
+      if (vulkan_context_provider) {
+        uint32_t output_surface_id = next_output_surface_id_++;
+        return base::WrapUnique(new DelegatedCompositorOutputSurface(
+            routing_id(), output_surface_id, context_provider,
+            worker_context_provider, vulkan_context_provider,
+            frame_swap_message_queue_));
+      }
     }
-#endif
 
     gpu::SharedMemoryLimits limits;
     // The renderer compositor context doesn't do a lot of stuff, so we don't
     // expect it to need a lot of space for commands or transfer. Raster and
     // uploads happen on the worker context instead.
     limits.command_buffer_size = 64 * 1024;
     limits.start_transfer_buffer_size = 64 * 1024;
     limits.min_transfer_buffer_size = 64 * 1024;
 
     context_provider = new ContextProviderCommandBuffer(
@@ skipping 23 matching lines @@
   uint32_t output_surface_id = next_output_surface_id_++;
   // Composite-to-mailbox is currently used for layout tests in order to cause
   // them to draw inside in the renderer to do the readback there. This should
   // no longer be the case when crbug.com/311404 is fixed.
   if (!RenderThreadImpl::current() ||
       !RenderThreadImpl::current()->layout_test_mode()) {
     DCHECK(compositor_deps_->GetCompositorImplThreadTaskRunner());
     return base::WrapUnique(new DelegatedCompositorOutputSurface(
         routing_id(), output_surface_id, std::move(context_provider),
         std::move(worker_context_provider),
-#if defined(ENABLE_VULKAN)
         vulkan_context_provider,
-#endif
         frame_swap_message_queue_));
   }
 
   if (!context_provider) {
     std::unique_ptr<cc::SoftwareOutputDevice> software_device(
         new cc::SoftwareOutputDevice());
 
     return base::WrapUnique(new CompositorOutputSurface(
-        routing_id(), output_surface_id, nullptr, nullptr,
-#if defined(ENABLE_VULKAN)
-        nullptr,
-#endif
+        routing_id(), output_surface_id, nullptr, nullptr, nullptr,
         std::move(software_device), frame_swap_message_queue_, true));
   }
 
   return base::WrapUnique(new MailboxOutputSurface(
       routing_id(), output_surface_id, std::move(context_provider),
       std::move(worker_context_provider), frame_swap_message_queue_,
       cc::RGBA_8888));
 }
 
 std::unique_ptr<cc::BeginFrameSource>
@@ skipping 1269 matching lines @@
 }
 
 float RenderWidget::GetOriginalDeviceScaleFactor() const {
   return
       screen_metrics_emulator_ ?
       screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
       device_scale_factor_;
 }
 
 }  // namespace content