diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-ui_gl_gl__switches.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-ui_gl_gl__switches.cc')
| -rw-r--r-- | devel/electron35/files/patch-ui_gl_gl__switches.cc | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/devel/electron35/files/patch-ui_gl_gl__switches.cc b/devel/electron35/files/patch-ui_gl_gl__switches.cc deleted file mode 100644 index f3d8b85f3d31..000000000000 --- a/devel/electron35/files/patch-ui_gl_gl__switches.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/gl/gl_switches.cc.orig 2025-03-24 20:50:14 UTC -+++ ui/gl/gl_switches.cc -@@ -13,7 +13,7 @@ - #include "base/android/build_info.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include <vulkan/vulkan_core.h> - #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck - #endif -@@ -314,7 +314,7 @@ bool IsDefaultANGLEVulkan() { - return false; - } - #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - angle::SystemInfo system_info; - { - GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan"); -@@ -367,7 +367,7 @@ bool IsDefaultANGLEVulkan() { - } - #endif // BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // AMDVLK driver is buggy, so disable Vulkan with AMDVLK for now. - // crbug.com/1340081 - if (active_gpu.driverId == VK_DRIVER_ID_AMD_OPEN_SOURCE) |