Add bits to indicate which parts of GPUInfo are collected.

gpu/config/gpu_info_collector_linux.cc

 // Copyright 2014 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_linux.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 51 matching lines @@
       }
     }
   }
   return std::string();
 }
 
 const uint32 kVendorIDIntel = 0x8086;
 const uint32 kVendorIDNVidia = 0x10de;
 const uint32 kVendorIDAMD = 0x1002;
 
-bool CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
+CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   if (IsPciSupported() == false) {
     VLOG(1) << "PCI bus scanning is not supported";
-    return false;
+    return kCollectInfoNonFatalFailure;
   }
 
   // TODO(zmo): be more flexible about library name.
   LibPciLoader libpci_loader;
   if (!libpci_loader.Load("libpci.so.3") &&
       !libpci_loader.Load("libpci.so")) {
     VLOG(1) << "Failed to locate libpci";
-    return false;
+    return kCollectInfoNonFatalFailure;
   }
 
   pci_access* access = (libpci_loader.pci_alloc)();
   DCHECK(access != NULL);
   (libpci_loader.pci_init)(access);
   (libpci_loader.pci_scan_bus)(access);
   bool primary_gpu_identified = false;
   for (pci_dev* device = access->devices;
        device != NULL; device = device->next) {
     // Fill the IDs and class fields.
     (libpci_loader.pci_fill_info)(device, 33);
     bool is_gpu = false;
     switch (device->device_class) {
       case PCI_CLASS_DISPLAY_VGA:
       case PCI_CLASS_DISPLAY_XGA:
       case PCI_CLASS_DISPLAY_3D:
         is_gpu = true;
         break;
       case PCI_CLASS_DISPLAY_OTHER:
       default:
         break;
     }
     if (!is_gpu)
       continue;
+    if (device->vendor_id == 0 || device->device_id == 0)
+      continue;
 
     GPUInfo::GPUDevice gpu;
     gpu.vendor_id = device->vendor_id;
     gpu.device_id = device->device_id;
 
     if (!primary_gpu_identified) {
       primary_gpu_identified = true;
       gpu_info->gpu = gpu;
     } else {
       // TODO(zmo): if there are multiple GPUs, we assume the non Intel
@@ skipping 12 matching lines @@
   // Detect Optimus or AMD Switchable GPU.
   if (gpu_info->secondary_gpus.size() == 1 &&
       gpu_info->secondary_gpus[0].vendor_id == kVendorIDIntel) {
     if (gpu_info->gpu.vendor_id == kVendorIDNVidia)
       gpu_info->optimus = true;
     if (gpu_info->gpu.vendor_id == kVendorIDAMD)
       gpu_info->amd_switchable = true;
   }
 
   (libpci_loader.pci_cleanup)(access);
-  return (primary_gpu_identified);
+  if (!primary_gpu_identified)
+    return kCollectInfoNonFatalFailure;
+  return kCollectInfoSuccess;
 }
 
 }  // namespace anonymous
 
 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kGpuNoContextLost)) {
     gpu_info->can_lose_context = false;
   } else {
 #if defined(OS_CHROMEOS)
     gpu_info->can_lose_context = false;
 #else
     // TODO(zmo): need to consider the case where we are running on top
     // of desktop GL and GL_ARB_robustness extension is available.
     gpu_info->can_lose_context =
         (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
 #endif
   }
 
   CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
-  gpu_info->finalized = true;
+  gpu_info->context_info_state = result;
   return result;
 }
 
-GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
+CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
   DCHECK(vendor_id && device_id);
   *vendor_id = 0;
   *device_id = 0;
 
   GPUInfo gpu_info;
-  if (CollectPCIVideoCardInfo(&gpu_info)) {
+  CollectInfoResult result = CollectPCIVideoCardInfo(&gpu_info);
+  if (result == kCollectInfoSuccess) {
     *vendor_id = gpu_info.gpu.vendor_id;
     *device_id = gpu_info.gpu.device_id;
-    if (*vendor_id != 0 && *device_id != 0)
-      return kGpuIDSuccess;
   }
-  return kGpuIDFailure;
+  return result;
 }
 
 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
-  bool rt = CollectPCIVideoCardInfo(gpu_info);
+  CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info);
 
   std::string driver_version;
   switch (gpu_info->gpu.vendor_id) {
     case kVendorIDAMD:
       driver_version = CollectDriverVersionATI();
       if (!driver_version.empty()) {
         gpu_info->driver_vendor = "ATI / AMD";
         gpu_info->driver_version = driver_version;
       }
       break;
@@ skipping 16 matching lines @@
           // Put Intel to the secondary GPU list.
           gpu_info->secondary_gpus.push_back(gpu_info->gpu);
           // Put NVIDIA as the primary GPU.
           gpu_info->gpu.vendor_id = kVendorIDNVidia;
           gpu_info->gpu.device_id = 0;  // Unknown Device.
         }
       }
       break;
   }
 
-  return rt ? kCollectInfoSuccess : kCollectInfoNonFatalFailure;
+  gpu_info->basic_info_state = result;
+  return result;
 }
 
 CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   std::string gl_version = gpu_info->gl_version;
   if (StartsWithASCII(gl_version, "OpenGL ES", true))
     gl_version = gl_version.substr(10);
   std::vector<std::string> pieces;
   base::SplitStringAlongWhitespace(gl_version, &pieces);
@@ skipping 13 matching lines @@
   gpu_info->driver_version = driver_version;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu