Blacklist GLX indirect rendering

gpu/config/gpu_info_collector_x11.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 <X11/Xlib.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 59 matching lines @@
 // Use NVCtrl extention to query NV driver version.
 // Return empty string on failing.
 std::string CollectDriverVersionNVidia() {
   Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
   if (!display) {
     LOG(ERROR) << "XOpenDisplay failed.";
     return std::string();
   }
   int event_base = 0, error_base = 0;
   if (!XNVCTRLQueryExtension(display, &event_base, &error_base)) {
-    LOG(INFO) << "NVCtrl extension does not exist.";
+    VLOG(1) << "NVCtrl extension does not exist.";
     return std::string();
   }
   int screen_count = ScreenCount(display);
   for (int screen = 0; screen < screen_count; ++screen) {
     char* buffer = NULL;
     if (XNVCTRLIsNvScreen(display, screen) &&
         XNVCTRLQueryStringAttribute(display, screen, 0,
                                     NV_CTRL_STRING_NVIDIA_DRIVER_VERSION,
                                     &buffer)) {
       std::string driver_version(buffer);
@@ skipping 66 matching lines @@
     if (gpu_info->gpu.vendor_id == kVendorIDAMD)
       gpu_info->amd_switchable = true;
   }
 
   (libpci_loader.pci_cleanup)(access);
   return (primary_gpu_identified);
 }
 
 }  // namespace anonymous
 
-bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
+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;
-  bool rt = CollectGraphicsInfoGL(gpu_info);
-
-  return rt;
+  return result;
 }
 
 GpuIDResult 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)) {
     *vendor_id = gpu_info.gpu.vendor_id;
     *device_id = gpu_info.gpu.device_id;
     return kGpuIDSuccess;
   }
   return kGpuIDFailure;
 }
 
-bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
+CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   bool rt = 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";
@@ skipping 14 matching lines @@
       if (!driver_version.empty()) {
         gpu_info->driver_vendor = "NVIDIA";
         gpu_info->driver_version = driver_version;
         // Machines with more than two GPUs are not handled.
         if (gpu_info->secondary_gpus.size() <= 1)
           gpu_info->optimus = true;
       }
       break;
   }
 
-  return rt;
+  return rt ? kCollectInfoSuccess : kCollectInfoNonFatalFailure;
 }
 
-bool CollectDriverInfoGL(GPUInfo* gpu_info) {
+CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   std::string gl_version_string = gpu_info->gl_version_string;
   if (StartsWithASCII(gl_version_string, "OpenGL ES", true))
     gl_version_string = gl_version_string.substr(10);
   std::vector<std::string> pieces;
   base::SplitStringAlongWhitespace(gl_version_string, &pieces);
   // In linux, the gl version string might be in the format of
   //   GLVersion DriverVendor DriverVersion
   if (pieces.size() < 3)
-    return false;
+    return kCollectInfoNonFatalFailure;
 
   std::string driver_version = pieces[2];
   size_t pos = driver_version.find_first_not_of("0123456789.");
   if (pos == 0)
-    return false;
+    return kCollectInfoNonFatalFailure;
   if (pos != std::string::npos)
     driver_version = driver_version.substr(0, pos);
 
   gpu_info->driver_vendor = pieces[1];
   gpu_info->driver_version = driver_version;
-  return true;
+  return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu