aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc')
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc36
1 files changed, 36 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
new file mode 100644
index 000000000000..c64b927b3136
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -0,0 +1,36 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2016-05-11 19:02:20 UTC
++++ content/browser/gpu/gpu_data_manager_impl_private.cc
+@@ -486,8 +486,10 @@ void GpuDataManagerImplPrivate::SetGLStr
+ gpu_info.gl_renderer = gl_renderer;
+ gpu_info.gl_version = gl_version;
+
++#if !defined(OS_FREEBSD)
+ gpu::IdentifyActiveGPU(&gpu_info);
+ gpu::CollectDriverInfoGL(&gpu_info);
++#endif
+
+ UpdateGpuInfo(gpu_info);
+ UpdateGpuSwitchingManager(gpu_info);
+@@ -529,10 +531,12 @@ void GpuDataManagerImplPrivate::Initiali
+ // Also declare the driver_vendor to be osmesa to be able to specify
+ // exceptions based on driver_vendor==osmesa for some blacklist rules.
+ gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
++#ifndef __FreeBSD__
+ } else {
+ TRACE_EVENT0("startup",
+ "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
+ gpu::CollectBasicGraphicsInfo(&gpu_info);
++#endif
+
+ if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
+ command_line->HasSwitch(switches::kGpuTestingDeviceId)) {
+@@ -631,7 +635,9 @@ void GpuDataManagerImplPrivate::UpdateGp
+ return;
+
+ bool was_info_available = IsCompleteGpuInfoAvailable();
++#ifndef __FreeBSD__
+ gpu::MergeGPUInfo(&gpu_info_, gpu_info);
++#endif
+ if (IsCompleteGpuInfoAvailable()) {
+ complete_gpu_info_already_requested_ = true;
+ } else if (was_info_available) {