Chromium Code Reviews| Index: content/renderer/render_widget.cc |
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
| index 896f57c81f33599c80e4905bf378c5b4af0a8322..a02082cb476ee069574c8655dd9fc0ef9f617ee6 100644 |
| --- a/content/renderer/render_widget.cc |
| +++ b/content/renderer/render_widget.cc |
| @@ -780,13 +780,15 @@ std::unique_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface( |
| scoped_refptr<ContextProviderCommandBuffer> worker_context_provider; |
| if (!use_software) { |
| #if defined(ENABLE_VULKAN) |
|
piman
2016/04/19 23:42:02
I think you don't need this ifdef any more.
|
| - 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 |