summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 13:55:13 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 13:55:13 +0000
commitb9413812ebdff06d11411609e571fd52d6264db0 (patch)
tree4afd33a69dbb5d96c27f8bf0834bceae791a6719
parent77e3163e1ee1ca690ee255bb9d69dad9e70b4344 (diff)
downloadchromium_src-b9413812ebdff06d11411609e571fd52d6264db0.zip
chromium_src-b9413812ebdff06d11411609e571fd52d6264db0.tar.gz
chromium_src-b9413812ebdff06d11411609e571fd52d6264db0.tar.bz2
Limit recomputing of gpu driver bug workarounds to chromeos and android
I don't feel other platforms will benefit, rather, they could possibly lose some. For example, on Linux CollectContextGraphicsInfo does not do PCI scan for vendor/device IDs (sandbox issues, efficiency issues, etc). Therefore, multiple-gpu entries will be skipped, as we only pass the primary gpu info from browser process to gpu process. BUG=306231 TEST= R=piman@chromium.org Review URL: https://codereview.chromium.org/110923004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240623 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/gpu/gpu_main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 35fa4be..f7650e7 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -236,12 +236,14 @@ int GpuMain(const MainFunctionParams& parameters) {
VLOG(1) << "gpu::CollectGraphicsInfo failed";
GetContentClient()->SetGpuInfo(gpu_info);
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
// Recompute gpu driver bug workarounds - this is specifically useful
- // on ChromeOS where vendor_id/device_id aren't available.
+ // on systems where vendor_id/device_id aren't available.
if (!command_line.HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
gpu::ApplyGpuDriverBugWorkarounds(
gpu_info, const_cast<CommandLine*>(&command_line));
}
+#endif
#if defined(OS_LINUX)
initialized_gl_context = true;