summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
diff options
context:
space:
mode:
authorMatthias Wolf <matthias@rheinwolf.de>2021-06-17 11:22:35 +0200
committerRene Ladan <rene@FreeBSD.org>2021-06-17 11:28:36 +0200
commit06317815238060a3a7f5911f18a3dd7c95779c83 (patch)
tree142df5b4e1e27da8f00b667eb5b8656cb0234ec0 /www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
parentdns/bundy: Mark as broken on FreeBSD 14. (diff)
www/chromium: update to 91.0.4472.101
Security: https://vuxml.freebsd.org/freebsd/20b3ab21-c9df-11eb-8558-3065ec8fd3ec.html
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.cc32
1 files changed, 16 insertions, 16 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 5034c5008f3b..d33ef4bee500 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig 2021-04-14 18:41:04 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2021-05-12 22:05:54 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
+@@ -118,7 +118,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
}
#if BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -9,7 +9,7 @@
bool CanAccessNvidiaDeviceFile() {
bool res = true;
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -129,7 +129,7 @@ bool CanAccessNvidiaDeviceFile() {
}
return res;
}
@@ -18,7 +18,7 @@
// !BUILDFLAG(IS_CHROMECAST))
class GpuWatchdogInit {
-@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -216,7 +216,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
device_perf_info_ = device_perf_info;
}
@@ -27,7 +27,7 @@
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
+@@ -268,7 +268,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
delayed_watchdog_enable = true;
#endif
@@ -36,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.
-@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -308,7 +308,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -45,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.
-@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
attempted_startsandbox = true;
}
@@ -54,7 +54,7 @@
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
-@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -359,7 +359,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
if (gl_initialized && gl_use_swiftshader_ &&
gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
@@ -63,7 +63,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
SaveHardwareGpuInfoAndGpuFeatureInfo();
gl::init::ShutdownGL(true);
gl_initialized = false;
@@ -72,7 +72,7 @@
}
if (!gl_initialized) {
-@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -393,7 +393,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
-@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -458,7 +458,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;
-@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -473,7 +473,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
<< "failed";
return false;
}
@@ -99,7 +99,7 @@
}
} else { // gl_use_swiftshader_ == true
switch (gpu_preferences_.use_vulkan) {
-@@ -535,7 +535,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -549,7 +549,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.
-@@ -554,7 +554,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -568,7 +568,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
return false;
}
}
@@ -117,7 +117,7 @@
if (gl_use_swiftshader_) {
AdjustInfoToSwiftShader();
-@@ -737,7 +737,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -755,7 +755,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.
-@@ -758,7 +758,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -776,7 +776,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
}
}