diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 23:05:25 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 23:05:25 +0000 |
| commit | 1579bd72783cc161ee85050fb3fa3c032eb826cf (patch) | |
| tree | f6c712efd7dfc703cf27ab5789384d7a9718c00c /content | |
| parent | d392012e496aee8e7fd65154abd05514a6b7334c (diff) | |
| download | chromium_src-1579bd72783cc161ee85050fb3fa3c032eb826cf.zip chromium_src-1579bd72783cc161ee85050fb3fa3c032eb826cf.tar.gz chromium_src-1579bd72783cc161ee85050fb3fa3c032eb826cf.tar.bz2 | |
Merge 178930
> Android: Enable virtual contexts on NVIDIA
>
> BUG=163464
>
> Review URL: https://codereview.chromium.org/12066004
TBR=sievers@chromium.org
Review URL: https://codereview.chromium.org/12088003
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@178934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/gpu/gpu_info_collector_android.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/gpu/gpu_info_collector_android.cc b/content/gpu/gpu_info_collector_android.cc index 924b119..8d98355 100644 --- a/content/gpu/gpu_info_collector_android.cc +++ b/content/gpu/gpu_info_collector_android.cc @@ -63,12 +63,13 @@ bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) { bool is_img = vendor.find("imagination") != std::string::npos; bool is_arm = vendor.find("arm") != std::string::npos; bool is_qualcomm = vendor.find("qualcomm") != std::string::npos; + bool is_nvidia = vendor.find("nvidia") != std::string::npos; bool is_mali_t604 = is_arm && renderer.find("mali-t604") != std::string::npos; // IMG: avoid context switching perf problems, crashes with share groups // Mali-T604: http://crbug.com/154715 - // QualComm: Crashes with share groups - if (is_img || is_mali_t604 || is_qualcomm) { + // QualComm, NVIDIA: Crashes with share groups + if (is_img || is_mali_t604 || is_qualcomm || is_nvidia) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableVirtualGLContexts); } |