From eb79297ee0b3cbd09e68746c2035318da7f156c7 Mon Sep 17 00:00:00 2001 From: "sievers@chromium.org" Date: Tue, 12 Feb 2013 01:29:05 +0000 Subject: [PATCH] Android: Restrict virtual contexts on NVIDIA to Nexus 7. BUG=74138 TBR=apatrick@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/12225128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181811 0039d316-1c4b-4281-b951-d872f2087c98 --- content/gpu/gpu_info_collector_android.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/content/gpu/gpu_info_collector_android.cc b/content/gpu/gpu_info_collector_android.cc index 3073fbdbb144..233f8ca819b8 100644 --- a/content/gpu/gpu_info_collector_android.cc +++ b/content/gpu/gpu_info_collector_android.cc @@ -71,17 +71,18 @@ 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; - bool sdk_17_or_greater = - base::android::BuildInfo::GetInstance()->sdk_int() >= 17; + base::android::BuildInfo* build_info = + base::android::BuildInfo::GetInstance(); + std::string model = build_info->model(); + model = StringToLowerASCII(model); + bool is_nexus7 = model.find("nexus 7") != std::string::npos; // IMG: avoid context switching perf problems, crashes with share groups // Mali-T604: http://crbug.com/154715 // QualComm, NVIDIA: Crashes with share groups - if (is_img || is_mali_t604 || is_qualcomm || - (is_nvidia && sdk_17_or_greater)) { + if (is_img || is_mali_t604 || is_qualcomm || is_nexus7) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableVirtualGLContexts); } -- 2.11.4.GIT