Chromium Code Reviews| Index: content/gpu/gpu_child_thread.cc |
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc |
| index 1bb3df07e35f42846c9f352ac69012eda1b1bc1c..8b057c38c97516cd64ab763e078c8a5d03fecc43 100644 |
| --- a/content/gpu/gpu_child_thread.cc |
| +++ b/content/gpu/gpu_child_thread.cc |
| @@ -40,6 +40,10 @@ |
| #include "ui/ozone/public/ozone_platform.h" |
| #endif |
| +#if defined(ENABLE_VULKAN) |
| +#include "gpu/vulkan/vulkan_surface.h" |
| +#endif |
| + |
| namespace content { |
| namespace { |
| @@ -200,6 +204,11 @@ GpuChildThread::GpuChildThread( |
| gpu_info_.video_decode_accelerator_capabilities = |
| content::GpuVideoDecodeAccelerator::GetCapabilities(); |
| +#if defined(ENABLE_VULKAN) |
| + // Temporary Vulkan initialization injection. |
| + gfx::VulkanSurface::InitializeOneOff(); |
|
Nico
2016/03/09 02:43:33
shouldn't this be in the gpu namespace now?
David Yen
2016/03/09 18:44:49
Done.
|
| +#endif |
| + |
| if (!gfx::GLSurface::InitializeOneOff()) |
|
Nico
2016/03/09 02:43:33
do you still need this in vulkan builds? i'd have
David Yen
2016/03/09 18:44:49
Eventually, right now I'm just injecting the initi
|
| VLOG(1) << "gfx::GLSurface::InitializeOneOff failed"; |