diff options
Diffstat (limited to 'www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc index 2513ce5c68d0..f1172d9981fd 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc @@ -1,29 +1,29 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-05-19 14:06:27 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-06-17 14:20:10 UTC +++ gpu/command_buffer/service/shared_image_factory.cc -@@ -46,7 +46,7 @@ - #include "ui/ozone/public/ozone_platform.h" +@@ -50,7 +50,7 @@ + #endif #endif -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_VULKAN) #include "gpu/command_buffer/service/external_vk_image_factory.h" - #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) -@@ -81,7 +81,7 @@ + #include "gpu/command_buffer/service/shared_image_backing_factory_ozone.h" +@@ -86,7 +86,7 @@ namespace gpu { --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ + !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CASTOS) && \ BUILDFLAG(ENABLE_VULKAN) -@@ -325,7 +325,7 @@ SharedImageFactory::SharedImageFactory( +@@ -387,7 +387,7 @@ SharedImageFactory::SharedImageFactory( factories_.push_back(std::move(external_vk_image_factory)); } #elif defined(USE_OZONE) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) + !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CASTOS) // Desktop Linux, not ChromeOS. - if (gr_context_type_ == GrContextType::kVulkan && + if (ShouldUseOzoneFactory()) { |