Chromium Code Reviews| Index: content/browser/compositor/gpu_process_transport_factory.h |
| diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h |
| index 1996a848f2689d104b9d63d7bf0bbe55f8a55e68..0343c46055c9e15cb1b37827e9d4a0b7d8a9ba47 100644 |
| --- a/content/browser/compositor/gpu_process_transport_factory.h |
| +++ b/content/browser/compositor/gpu_process_transport_factory.h |
| @@ -30,6 +30,7 @@ namespace cc { |
| class SingleThreadTaskGraphRunner; |
| class SoftwareOutputDevice; |
| class SurfaceManager; |
| +class VulkanInProcessContextProvider; |
| } |
| namespace content { |
| @@ -101,6 +102,11 @@ class GpuProcessTransportFactory |
| void OnLostMainThreadSharedContextInsideCallback(); |
| void OnLostMainThreadSharedContext(); |
| +#if defined(ENABLE_VULKAN) |
|
piman
2016/04/19 01:36:42
Trying to find a way to limit the amount of #ifdef
David Yen
2016/04/19 22:20:28
Done. The only thing is we still have to #ifdef ou
piman
2016/04/19 23:29:57
Yeah, I think I agree. I'm thinking that eventuall
|
| + scoped_refptr<cc::VulkanInProcessContextProvider> |
| + SharedVulkanContextProvider(); |
| +#endif |
| + |
| typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; |
| PerCompositorDataMap per_compositor_data_; |
| scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
| @@ -111,6 +117,12 @@ class GpuProcessTransportFactory |
| std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; |
| scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; |
| +#if defined(ENABLE_VULKAN) |
| + bool shared_vulkan_context_provider_initialized_ = false; |
| + scoped_refptr<cc::VulkanInProcessContextProvider> |
| + shared_vulkan_context_provider_; |
| +#endif |
| + |
| #if defined(OS_WIN) |
| std::unique_ptr<OutputDeviceBacking> software_backing_; |
| #endif |