diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
commit | 2dd4dd29c063a32031fb5549616ba28e76310f0a (patch) | |
tree | 0427b26fe2d2bae71ff47102b5e646fdf927c022 /www/chromium/files/patch-gpu_ipc_service_gpu__init.cc | |
parent | devel/cdecl: update to 8.0. (diff) |
www/chromium: update to 84.0.4147.105
Submitted by: Matthias Wolf via GitHub
MFH: 2020Q3
Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html
Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.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.cc | 30 |
1 files changed, 15 insertions, 15 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 fe83facc0c4c..f33260dc9b3e 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2020-05-13 18:40:32 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-07-07 21:58:16 UTC +++ gpu/ipc/service/gpu_init.cc @@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif @@ -18,16 +18,16 @@ class GpuWatchdogInit { public: -@@ -161,7 +161,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - gpu_info_.subpixel_font_rendering = true; - #endif +@@ -160,7 +160,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + device_perf_info_ = device_perf_info; + } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -213,7 +213,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -212,7 +212,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. -@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -257,7 +257,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. -@@ -267,7 +267,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -266,7 +266,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(); -@@ -291,14 +291,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -289,14 +289,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && use_swiftshader && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -71,7 +71,7 @@ } if (!gl_initialized) { -@@ -324,7 +324,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -322,7 +322,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -80,7 +80,7 @@ // The ContentSandboxHelper is currently the only one implementation of // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -375,7 +375,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (use_swiftshader) { @@ -89,7 +89,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -98,7 +98,7 @@ } } else { // use_swiftshader == true switch (gpu_preferences_.use_vulkan) { -@@ -445,7 +445,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -443,7 +443,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -107,7 +107,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. -@@ -464,7 +464,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -462,7 +462,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -116,7 +116,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -631,7 +631,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -125,7 +125,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. -@@ -651,7 +651,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -648,7 +648,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } |