Merge 220427 "Android: Disable virtual contexts for NV and QC on..."

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 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/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 24 matching lines @@
 #include "ui/gl/gpu_switching_manager.h"
 #include "webkit/common/webpreferences.h"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif  // OS_MACOSX
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif  // OS_WIN
 #if defined(OS_ANDROID)
+#include "base/android/build_info.h"
 #include "ui/gfx/android/device_display_info.h"
 #endif  // OS_ANDROID
 
 namespace content {
 
 namespace {
 
 enum GpuFeatureStatus {
     kGpuFeatureEnabled = 0,
     kGpuFeatureBlacklisted = 1,
@@ skipping 216 matching lines @@
 
   bool is_vivante =
       gpu_info.gl_extensions.find("GL_VIV_shader_binary") !=
       std::string::npos;
 
   bool is_nexus7 =
       gpu_info.machine_model.find("Nexus 7") != std::string::npos;
   bool is_nexus10 =
       gpu_info.machine_model.find("Nexus 10") != std::string::npos;
 
+  int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
+
   // IMG: avoid context switching perf problems, crashes with share groups
   // Mali-T604: http://crbug.com/154715
   // QualComm, NVIDIA: Crashes with share groups
-  if (is_vivante || is_img || is_mali_t604 || is_nvidia || is_qualcomm ||
-      is_broadcom)
+  if (is_vivante || is_img || is_mali_t604 ||
+      ((is_nvidia || is_qualcomm) && sdk_int < 18) || is_broadcom) {
     command_line->AppendSwitch(switches::kEnableVirtualGLContexts);
+  }
 
   gfx::DeviceDisplayInfo info;
   int default_tile_size = 256;
 
   // For very high resolution displays (eg. Nexus 10), set the default
   // tile size to be 512. This should be removed in favour of a generic
   // hueristic that works across all platforms and devices, once that
   // exists: http://crbug.com/159524. This switches to 512 for screens
   // containing 40 or more 256x256 tiles, such that 1080p devices do
   // not use 512x512 tiles (eg. 1920x1280 requires 37.5 tiles)
@@ skipping 943 matching lines @@
 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() {
   gpu_process_accessible_ = false;
   gpu_info_.finalized = true;
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content