Do not lose secondary gpus and make sure to have an active gpu on multiple gpu configurations

gpu/config/gpu_info_collector.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 "gpu/config/gpu_info_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 158 matching lines @@
 
   IdentifyActiveGPU(gpu_info);
   return CollectDriverInfoGL(gpu_info);
 }
 
 void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
                     const GPUInfo& context_gpu_info) {
   DCHECK(basic_gpu_info);
   // Copy over GPUs because which one is active could change.
   basic_gpu_info->gpu = context_gpu_info.gpu;
-  basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
 
   basic_gpu_info->gl_renderer = context_gpu_info.gl_renderer;
   basic_gpu_info->gl_vendor = context_gpu_info.gl_vendor;
   basic_gpu_info->gl_version = context_gpu_info.gl_version;
   basic_gpu_info->gl_extensions = context_gpu_info.gl_extensions;
   basic_gpu_info->pixel_shader_version =
       context_gpu_info.pixel_shader_version;
   basic_gpu_info->vertex_shader_version =
       context_gpu_info.vertex_shader_version;
   basic_gpu_info->max_msaa_samples =
       context_gpu_info.max_msaa_samples;
   basic_gpu_info->gl_ws_vendor = context_gpu_info.gl_ws_vendor;
   basic_gpu_info->gl_ws_version = context_gpu_info.gl_ws_version;
   basic_gpu_info->gl_ws_extensions = context_gpu_info.gl_ws_extensions;
   basic_gpu_info->gl_reset_notification_strategy =
       context_gpu_info.gl_reset_notification_strategy;
 
+  if (!context_gpu_info.secondary_gpus.empty())
+    basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
   if (!context_gpu_info.driver_vendor.empty())
     basic_gpu_info->driver_vendor = context_gpu_info.driver_vendor;
   if (!context_gpu_info.driver_version.empty())
     basic_gpu_info->driver_version = context_gpu_info.driver_version;
 
   basic_gpu_info->can_lose_context = context_gpu_info.can_lose_context;
   basic_gpu_info->sandboxed = context_gpu_info.sandboxed;
   basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering;
   basic_gpu_info->in_process_gpu = context_gpu_info.in_process_gpu;
   basic_gpu_info->context_info_state = context_gpu_info.context_info_state;
   basic_gpu_info->initialization_time = context_gpu_info.initialization_time;
   basic_gpu_info->video_decode_accelerator_capabilities =
       context_gpu_info.video_decode_accelerator_capabilities;
   basic_gpu_info->video_encode_accelerator_supported_profiles =
       context_gpu_info.video_encode_accelerator_supported_profiles;
   basic_gpu_info->jpeg_decode_accelerator_supported =
       context_gpu_info.jpeg_decode_accelerator_supported;
 }
 
 void IdentifyActiveGPU(GPUInfo* gpu_info) {
   const std::string kNVidiaName = "nvidia";
+  const std::string kNouveauName = "nouveau";
   const std::string kIntelName = "intel";
   const std::string kAMDName = "amd";
   const std::string kATIName = "ati";
-  const std::string kVendorNames[] = {
-      kNVidiaName, kIntelName, kAMDName, kATIName};
+  const std::string kRadeonName = "radeon";
+  const std::string kVendorNames[] = {kNVidiaName, kNouveauName, kIntelName,
+                                      kAMDName,    kATIName,     kRadeonName};
 
   const uint32_t kNVidiaID = 0x10de;
   const uint32_t kIntelID = 0x8086;
   const uint32_t kAMDID = 0x1002;
   const uint32_t kATIID = 0x1002;
-  const uint32_t kVendorIDs[] = {kNVidiaID, kIntelID, kAMDID, kATIID};
+  const uint32_t kVendorIDs[] = {kNVidiaID, kNVidiaID, kIntelID,
+                                 kAMDID,    kATIID,    kAMDID};
 
   DCHECK(gpu_info);
   if (gpu_info->secondary_gpus.size() == 0)
     return;
 
   uint32_t active_vendor_id = 0;
   if (!gpu_info->gl_vendor.empty()) {
     std::string gl_vendor_lower = base::ToLowerASCII(gpu_info->gl_vendor);
     int index = StringContainsName(
         gl_vendor_lower, kVendorNames, arraysize(kVendorNames));
@@ skipping 26 matching lines @@
   for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) {
     if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) {
       gpu_info->secondary_gpus[ii].active = true;
       return;
     }
   }
 }
 
 }  // namespace gpu