diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 22:31:12 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 22:31:12 +0000 |
| commit | 0204bf120fc77eddbfb8d71f1ce9a302b4aa167c (patch) | |
| tree | b22a34bdfeb92cdf589d934b356db9ac3eb98aab /content | |
| parent | de79a57f8194cf8244087d094badc7f448e894c7 (diff) | |
| download | chromium_src-0204bf120fc77eddbfb8d71f1ce9a302b4aa167c.zip chromium_src-0204bf120fc77eddbfb8d71f1ce9a302b4aa167c.tar.gz chromium_src-0204bf120fc77eddbfb8d71f1ce9a302b4aa167c.tar.bz2 | |
Don't handle GPU accessibility in chrome os.
BUG=129240
TEST=chrome+aura+mesa works
R=piman
Review URL: https://chromiumcodereview.appspot.com/10451045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/gpu/gpu_info_collector_linux.cc | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_main.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index c3a6941..b117fd0 100644 --- a/content/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -207,11 +207,13 @@ bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) { } } +#if !defined(OS_CHROMEOS) // Disable all GPU features for Optimus on Linux. if (gpu_info->optimus) { gpu_info->gpu_accessible = false; gpu_info->finalized = true; } +#endif return rt; } diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index eee06ac..27caaa0 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -104,6 +104,7 @@ int GpuMain(const content::MainFunctionParams& parameters) { VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed"; content::GetContentClient()->SetGpuInfo(gpu_info); +#if !defined(OS_CHROMEOS) if (gpu_info.gpu.vendor_id == 0x10de && // NVIDIA gpu_info.driver_vendor == "NVIDIA") { base::ThreadRestrictions::AssertIOAllowed(); @@ -113,7 +114,8 @@ int GpuMain(const content::MainFunctionParams& parameters) { dead_on_arrival = true; } } -#endif +#endif // OS_CHROMEOS +#endif // OS_LINUX } else { VLOG(1) << "gfx::GLSurface::InitializeOneOff failed"; gpu_info.gpu_accessible = false; |