X11: Use better visuals for OpenGL

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>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_version_info.h"
 #include "ui/gl/init/gl_factory.h"
 
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+#include "ui/gl/gl_visual_picker_glx.h"
+#endif
+
 namespace {
 
 scoped_refptr<gl::GLSurface> InitializeGLSurface() {
   scoped_refptr<gl::GLSurface> surface(
       gl::init::CreateOffscreenGLSurface(gfx::Size()));
   if (!surface.get()) {
     LOG(ERROR) << "gl::GLContext::CreateOffscreenGLSurface failed";
     return NULL;
   }
 
@@ skipping 127 matching lines @@
 
   bool supports_robustness =
       gpu_info->gl_extensions.find("GL_EXT_robustness") != std::string::npos ||
       gpu_info->gl_extensions.find("GL_KHR_robustness") != std::string::npos ||
       gpu_info->gl_extensions.find("GL_ARB_robustness") != std::string::npos;
   if (supports_robustness) {
     glGetIntegerv(GL_RESET_NOTIFICATION_STRATEGY_ARB,
         reinterpret_cast<GLint*>(&gpu_info->gl_reset_notification_strategy));
   }
 
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+  if (gl::GetGLImplementation() == gl::kGLImplementationDesktopGL) {

[Tom (Use chromium acct), 2016/09/22 19:53:29]

The glx library is not loaded unless gl::GetGLImplementation() ==
gl::kGLImplementationDesktopGL.  So, I can't make calls to glXGetConfig

+    gl::GLVisualPickerGLX* visual_picker = gl::GLVisualPickerGLX::GetInstance();
+    gpu_info->system_visual = visual_picker->system_visual().visualid;
+    gpu_info->rgba_visual = visual_picker->rgba_visual().visualid;
+  }
+#endif
+
   // TODO(kbr): remove once the destruction of a current context automatically
   // clears the current context.
   context->ReleaseCurrent(surface.get());
 
   std::string glsl_version = GetVersionFromString(glsl_version_string);
   gpu_info->pixel_shader_version = glsl_version;
   gpu_info->vertex_shader_version = glsl_version;
 
   IdentifyActiveGPU(gpu_info);
   return CollectDriverInfoGL(gpu_info);
@@ skipping 31 matching lines @@
   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;
+
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+  basic_gpu_info->system_visual = context_gpu_info.system_visual;
+  basic_gpu_info->rgba_visual = context_gpu_info.rgba_visual;
+#endif
 }
 
 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, kNouveauName, kIntelName,
                                       kAMDName, kATIName};
@@ skipping 42 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
-