Store GLXFBConfig and get X visual ID from it.

client/deps/glbench/src/glx_stuff.cc

 // Copyright (c) 2010 The Chromium OS 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 <string.h>
 #include <GL/glx.h>
 
 #include "base/logging.h"
 #include "main.h"
 #include "xlib_window.h"
 
 static GLXContext glx_context = NULL;
+static GLXFBConfig glx_fbconfig = NULL;
 
 #define F(fun, type) type fun = NULL;
 LIST_PROC_FUNCTIONS(F)
 #undef F
 
 bool Init() {
   return XlibInit();
 }
 
-VisualID GetVisualID() {
-  int screen = DefaultScreen(g_xlib_display);
-  int attrib[] = {
-    GLX_DOUBLEBUFFER, True,
-    GLX_RED_SIZE, 1,
-    GLX_GREEN_SIZE, 1,
-    GLX_BLUE_SIZE, 1,
-    GLX_DEPTH_SIZE, 1,
-    GLX_STENCIL_SIZE, 1,
-    GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
-    None
-  };
-  int nelements;
-  GLXFBConfig *fbconfigs = glXChooseFBConfig(g_xlib_display, screen,
-                                             attrib, &nelements);
-  CHECK(nelements >= 1);
-  int visual_id;
-  glXGetFBConfigAttrib(g_xlib_display, fbconfigs[0], GLX_VISUAL_ID, &visual_id);
-  XFree(fbconfigs);
-  return static_cast<VisualID>(visual_id);
+XVisualInfo* GetXVisual() {
+  if (!glx_fbconfig) {
+    int screen = DefaultScreen(g_xlib_display);
+    int attrib[] = {
+      GLX_DOUBLEBUFFER, True,
+      GLX_RED_SIZE, 1,
+      GLX_GREEN_SIZE, 1,
+      GLX_BLUE_SIZE, 1,
+      GLX_DEPTH_SIZE, 1,
+      GLX_STENCIL_SIZE, 1,
+      GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+      None
+    };
+    int nelements;
+    GLXFBConfig *fbconfigs = glXChooseFBConfig(g_xlib_display, screen,
+                                               attrib, &nelements);
+    CHECK(nelements >= 1);
+    glx_fbconfig = fbconfigs[0];
+    XFree(fbconfigs);
+  }
+
+  return glXGetVisualFromFBConfig(g_xlib_display, glx_fbconfig);
 }
 
 bool InitContext() {
-  glx_context = glXCreateContext(g_xlib_display, g_xlib_visinfo, 0, True);
+  glx_context = glXCreateNewContext(g_xlib_display, glx_fbconfig,
+                                    GLX_RGBA_TYPE, 0, True);
   if (!glx_context)
     return false;
 
   if (!glXMakeCurrent(g_xlib_display, g_xlib_window, glx_context)) {
     glXDestroyContext(g_xlib_display, glx_context);
     return false;
   }
 
   glClearColor(1.f, 0, 0, 1.f);
   glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ skipping 21 matching lines @@
   glXDestroyContext(g_xlib_display, glx_context);
 }
 
 void SwapBuffers() {
   glXSwapBuffers(g_xlib_display, g_xlib_window);
 }
 
 bool SwapInterval(int interval) {
   return glXSwapIntervalSGI(interval) == 0;
 }