Merge 131225 - Disable image transport surface on AMD's dynamic switchable graphics.

content/browser/gpu/gpu_data_manager_impl.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/browser/gpu/gpu_data_manager_impl.h"
 
 #if defined(OS_MACOSX)
 #include <CoreGraphics/CGDisplayConfiguration.h>
 #endif
 
@@ skipping 221 matching lines @@
   }
 
   if (!swiftshader_path.empty())
     command_line->AppendSwitchPath(switches::kSwiftShaderPath,
                                    swiftshader_path);
 
   {
     base::AutoLock auto_lock(gpu_info_lock_);
     if (gpu_info_.optimus)
       command_line->AppendSwitch(switches::kReduceGpuSandbox);
+    if (gpu_info_.amd_switchable) {
+      // The image transport surface currently doesn't work with AMD Dynamic
+      // Switchable graphics.
+      command_line->AppendSwitch(switches::kReduceGpuSandbox);
+      command_line->AppendSwitch(switches::kDisableImageTransportSurface);
+    }
   }
 }
 
 void GpuDataManagerImpl::SetGpuFeatureType(GpuFeatureType feature_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UpdateGpuFeatureType(feature_type);
   preliminary_gpu_feature_type_ = gpu_feature_type_;
 }
 
 void GpuDataManagerImpl::HandleGpuSwitch() {
@@ skipping 81 matching lines @@
       object->vendor_id != other.vendor_id) {
     *object = other;
     return true;
   }
 
   bool changed = false;
   if (!object->finalized) {
     object->finalized = other.finalized;
     object->initialization_time = other.initialization_time;
     object->optimus |= other.optimus;
+    object->amd_switchable |= other.amd_switchable;
 
     if (object->driver_vendor.empty()) {
       changed |= object->driver_vendor != other.driver_vendor;
       object->driver_vendor = other.driver_vendor;
     }
     if (object->driver_version.empty()) {
       changed |= object->driver_version != other.driver_version;
       object->driver_version = other.driver_version;
     }
     if (object->driver_date.empty()) {
@@ skipping 34 matching lines @@
 #if defined(OS_WIN)
     if (object->dx_diagnostics.values.size() == 0 &&
         object->dx_diagnostics.children.size() == 0) {
       object->dx_diagnostics = other.dx_diagnostics;
       changed = true;
     }
 #endif
   }
   return changed;
 }