diff options
Diffstat (limited to 'devel/electron12/files/patch-gpu_ipc_service_gpu__init.cc')
-rw-r--r-- | devel/electron12/files/patch-gpu_ipc_service_gpu__init.cc | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/devel/electron12/files/patch-gpu_ipc_service_gpu__init.cc b/devel/electron12/files/patch-gpu_ipc_service_gpu__init.cc deleted file mode 100644 index 9a3068a212cb..000000000000 --- a/devel/electron12/files/patch-gpu_ipc_service_gpu__init.cc +++ /dev/null @@ -1,137 +0,0 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2021-04-14 01:08:50 UTC -+++ gpu/ipc/service/gpu_init.cc -@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in - } - - #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) - bool CanAccessNvidiaDeviceFile() { - bool res = true; - base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() { - } - return res; - } --#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || (defined(OS_LINUX) && -+#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) || (defined(OS_LINUX) && - // !BUILDFLAG(IS_CHROMECAST)) - - class GpuWatchdogInit { -@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - device_perf_info_ = device_perf_info; - } - --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA - gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) - return false; -@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - delayed_watchdog_enable = true; - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // PreSandbox is mainly for resource handling and not related to the GPU - // driver, it doesn't need the GPU watchdog. The loadLibrary may take long - // time that killing and restarting the GPU process will not help. -@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } - - bool attempted_startsandbox = false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // On Chrome OS ARM Mali, GPU driver userspace creates threads when - // initializing a GL context, so start the sandbox early. - // TODO(zmo): Need to collect OS version before this. -@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - watchdog_thread_.get(), &gpu_info_, gpu_preferences_); - attempted_startsandbox = true; - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); - -@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } - if (gl_initialized && gl_use_swiftshader_ && - gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " - << "on Linux"; - return false; -@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - SaveHardwareGpuInfoAndGpuFeatureInfo(); - gl::init::ShutdownGL(true); - gl_initialized = false; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - } - - if (!gl_initialized) { -@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // The ContentSandboxHelper is currently the only one implementation of - // GpuSandboxHelper and it has no dependency. Except on Linux where - // VaapiWrapper checks the GL implementation to determine which display -@@ -433,7 +433,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - command_line, gpu_feature_info_, - gpu_preferences_.disable_software_rasterizer, false); - if (gl_use_swiftshader_) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " - << "on Linux"; - return false; -@@ -448,7 +448,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - << "failed"; - return false; - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - } - } else { // gl_use_swiftshader_ == true - switch (gpu_preferences_.use_vulkan) { -@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - - InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Driver may create a compatibility profile context when collect graphics - // information on Linux platform. Try to collect graphics information - // based on core profile context after disabling platform extensions. -@@ -543,7 +543,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - return false; - } - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - if (gl_use_swiftshader_) { - AdjustInfoToSwiftShader(); -@@ -726,7 +726,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c - - InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Driver may create a compatibility profile context when collect graphics - // information on Linux platform. Try to collect graphics information - // based on core profile context after disabling platform extensions. -@@ -747,7 +747,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c - } - } - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - if (gl_use_swiftshader_) { - AdjustInfoToSwiftShader(); |