Android: Only allow virtual contexts on NV for SDK >= 17

content/gpu/gpu_info_collector_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_info_collector.h"
 
+#include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "content/public/common/content_switches.h"
 
 namespace {
 
@@ skipping 42 matching lines @@
     return false;
 
   std::string vendor(StringToLowerASCII(gpu_info->gl_vendor));
   std::string renderer(StringToLowerASCII(gpu_info->gl_renderer));
   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;

[klobag.chromium, 2013/02/05 22:28:49]

I assume we already have this at this stage.

+
   // 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) {
+  if (is_img || is_mali_t604 || is_qualcomm ||
+      (is_nvidia && sdk_17_or_greater)) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableVirtualGLContexts);
   }
 
   int default_tile_size = 256;
 
   // IMG: Fast async texture uploads only work with non-power-of-two,
   // but still multiple-of-eight sizes.
   // http://crbug.com/168099
   if (is_img)
@@ skipping 22 matching lines @@
       gpu_info->gl_version_string);
   return true;
 }
 
 void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
                   const content::GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu_info_collector