diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-03-29 20:42:38 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-29 20:44:59 +0000 |
| commit | 1e683edf9a258d43c95b485ad96f5c39860770cb (patch) | |
| tree | 0a7fbd0d7c8ce4cc3a87f4bd35de427374a8f45f /www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc | |
| parent | 884d2c502102da1eb803a5d178e7c7189e657340 (diff) | |
| download | ports-1e683edf9a258d43c95b485ad96f5c39860770cb.tar.gz ports-1e683edf9a258d43c95b485ad96f5c39860770cb.zip | |
www/chromium: update to 100.0.4896.60
Enable some more unit tests.
Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
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 | 31 |
1 files changed, 16 insertions, 15 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 ac36bf032db2..b12a153e058a 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,20 +1,21 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/command_buffer/service/shared_image_factory.cc -@@ -34,11 +34,11 @@ - #include "ui/gl/gl_switches.h" - #include "ui/gl/trace_util.h" +@@ -38,12 +38,12 @@ + #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" + #endif -#if BUILDFLAG(IS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) #include "ui/ozone/public/ozone_platform.h" #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) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ +- BUILDFLAG(ENABLE_VULKAN) ++ BUILDFLAG(ENABLE_VULKAN) || BUILDFLAG(IS_BSD) #include "gpu/command_buffer/service/external_vk_image_factory.h" - #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" -@@ -75,7 +75,7 @@ + #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) + #include "gpu/command_buffer/service/external_vk_image_factory.h" +@@ -78,7 +78,7 @@ namespace gpu { @@ -23,12 +24,12 @@ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ BUILDFLAG(ENABLE_VULKAN) -@@ -200,7 +200,7 @@ SharedImageFactory::SharedImageFactory( - // |gr_context_type|. - if (gr_context_type_ == GrContextType::kVulkan) { - #if BUILDFLAG(ENABLE_VULKAN) +@@ -240,7 +240,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) - // Desktop Linux, not ChromeOS. - if (base::FeatureList::IsEnabled(features::kVulkanFromANGLE)) { + // Desktop Linux, not ChromeOS. + if (gr_context_type_ == GrContextType::kVulkan && |