86 lines
3.5 KiB
C++
86 lines
3.5 KiB
C++
$NetBSD$
|
|
|
|
--- gpu/ipc/service/gpu_init.cc.orig 2020-07-08 21:41:48.000000000 +0000
|
|
+++ gpu/ipc/service/gpu_init.cc
|
|
@@ -94,7 +94,7 @@ void InitializePlatformOverlaySettings(G
|
|
#endif
|
|
}
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)
|
|
bool CanAccessNvidiaDeviceFile() {
|
|
bool res = true;
|
|
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
|
|
@@ -178,7 +178,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
device_perf_info_ = device_perf_info;
|
|
}
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA
|
|
gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
|
|
return false;
|
|
@@ -230,7 +230,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
delayed_watchdog_enable = true;
|
|
#endif
|
|
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || 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.
|
|
@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
}
|
|
|
|
bool attempted_startsandbox = false;
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || 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(
|
|
}
|
|
if (gl_initialized && gl_use_swiftshader_ &&
|
|
gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
|
|
<< "on Linux";
|
|
return false;
|
|
@@ -340,7 +340,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
}
|
|
}
|
|
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || 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
|
|
@@ -392,7 +392,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
command_line, gpu_feature_info_,
|
|
gpu_preferences_.disable_software_rasterizer, false);
|
|
if (gl_use_swiftshader_) {
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
|
|
<< "on Linux";
|
|
return false;
|
|
@@ -482,7 +482,7 @@ bool GpuInit::InitializeAndStartSandbox(
|
|
|
|
InitializePlatformOverlaySettings(&gpu_info_);
|
|
|
|
-#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.
|
|
@@ -667,7 +667,7 @@ void GpuInit::InitializeInProcess(base::
|
|
|
|
InitializePlatformOverlaySettings(&gpu_info_);
|
|
|
|
-#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.
|