summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-gpu_ipc_service_gpu__init.cc')
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc50
1 files changed, 25 insertions, 25 deletions
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 612820346264..2c9c98fb0cd9 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,34 +1,33 @@
---- gpu/ipc/service/gpu_init.cc.orig 2021-01-18 21:28:59 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2021-03-12 23:57:25 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
- #endif
+@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
}
--#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+ #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,
-@@ -118,8 +118,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() {
}
return res;
}
--#endif // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) &&
-- // !BUILDFLAG(IS_CHROMECAST))
-+#endif // BUILDFLAG(IS_LACROS) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+-#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || (defined(OS_LINUX) &&
++#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) || (defined(OS_LINUX) &&
+ // !BUILDFLAG(IS_CHROMECAST))
class GpuWatchdogInit {
- public:
-@@ -205,7 +204,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
device_perf_info_ = device_perf_info;
}
--#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS)
-+#if defined(OS_LINUX) || BUILDFLAG(IS_LACROS) || defined(OS_BSD)
+-#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;
-@@ -257,7 +256,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
delayed_watchdog_enable = true;
#endif
@@ -37,7 +36,7 @@
// 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.
-@@ -297,7 +296,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -46,7 +45,7 @@
// 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.
-@@ -306,7 +305,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
attempted_startsandbox = true;
}
@@ -55,7 +54,7 @@
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
-@@ -334,14 +333,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
if (gl_initialized && gl_use_swiftshader_ &&
gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
@@ -64,7 +63,8 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
- #else
+@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ SaveHardwareGpuInfoAndGpuFeatureInfo();
gl::init::ShutdownGL(true);
gl_initialized = false;
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -72,7 +72,7 @@
}
if (!gl_initialized) {
-@@ -367,7 +366,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
@@ -81,7 +81,7 @@
// 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
-@@ -421,7 +420,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -433,7 +433,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -90,7 +90,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -435,7 +434,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -448,7 +448,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
<< "failed";
return false;
}
@@ -99,7 +99,7 @@
}
} else { // gl_use_swiftshader_ == true
switch (gpu_preferences_.use_vulkan) {
-@@ -511,7 +510,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -524,7 +524,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -108,7 +108,7 @@
// 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.
-@@ -530,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -543,7 +543,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
return false;
}
}
@@ -117,7 +117,7 @@
if (gl_use_swiftshader_) {
AdjustInfoToSwiftShader();
-@@ -700,7 +699,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -726,7 +726,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -126,7 +126,7 @@
// 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.
-@@ -720,7 +719,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -747,7 +747,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 06:22:42 +0000