diff options
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 | 56 |
1 files changed, 55 insertions, 1 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 d077e2e95c77..579cba128615 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 2019-04-30 22:22:49 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/service/gpu_init.cc @@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo } @@ -9,6 +9,15 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, +@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() { + } + return res; + } +-#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST ++#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD + + } // namespace + @@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); @@ -27,3 +36,48 @@ // 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. +@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + watchdog_thread_.get(), &gpu_info_, gpu_preferences_); + attempted_startsandbox = true; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) && !defined(OS_BSD) + + base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); + +@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + InitializeDirectCompositionOverlaySupport(&gpu_info_); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || 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. +@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); +@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + InitializeDirectCompositionOverlaySupport(&gpu_info_); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || 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. +@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + } + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); |