Update from https://crrev.com/314320

ui/gl/gl_bindings_autogen_glx.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.
 //
 // This file is auto-generated from
 // ui/gl/generate_bindings.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
 #include <string>
 
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_enums.h"
 #include "ui/gl/gl_glx_api_implementation.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace gfx {
 
 static bool g_debugBindingsInitialized;
 DriverGLX g_driver_glx;
 
 void DriverGLX::InitializeStaticBindings() {
-  fn.glXBindTexImageEXTFn = reinterpret_cast<glXBindTexImageEXTProc>(
-      GetGLProcAddress("glXBindTexImageEXT"));
+  fn.glXBindTexImageEXTFn = 0;
   fn.glXChooseFBConfigFn = reinterpret_cast<glXChooseFBConfigProc>(
       GetGLProcAddress("glXChooseFBConfig"));
   fn.glXChooseVisualFn = reinterpret_cast<glXChooseVisualProc>(
       GetGLProcAddress("glXChooseVisual"));
   fn.glXCopyContextFn =
       reinterpret_cast<glXCopyContextProc>(GetGLProcAddress("glXCopyContext"));
-  fn.glXCopySubBufferMESAFn = reinterpret_cast<glXCopySubBufferMESAProc>(
-      GetGLProcAddress("glXCopySubBufferMESA"));
+  fn.glXCopySubBufferMESAFn = 0;
   fn.glXCreateContextFn = reinterpret_cast<glXCreateContextProc>(
       GetGLProcAddress("glXCreateContext"));
-  fn.glXCreateContextAttribsARBFn =
-      reinterpret_cast<glXCreateContextAttribsARBProc>(
-          GetGLProcAddress("glXCreateContextAttribsARB"));
+  fn.glXCreateContextAttribsARBFn = 0;
   fn.glXCreateGLXPixmapFn = reinterpret_cast<glXCreateGLXPixmapProc>(
       GetGLProcAddress("glXCreateGLXPixmap"));
   fn.glXCreateNewContextFn = reinterpret_cast<glXCreateNewContextProc>(
       GetGLProcAddress("glXCreateNewContext"));
   fn.glXCreatePbufferFn = reinterpret_cast<glXCreatePbufferProc>(
       GetGLProcAddress("glXCreatePbuffer"));
   fn.glXCreatePixmapFn = reinterpret_cast<glXCreatePixmapProc>(
       GetGLProcAddress("glXCreatePixmap"));
   fn.glXCreateWindowFn = reinterpret_cast<glXCreateWindowProc>(
       GetGLProcAddress("glXCreateWindow"));
@@ skipping 15 matching lines @@
       GetGLProcAddress("glXGetCurrentContext"));
   fn.glXGetCurrentDisplayFn = reinterpret_cast<glXGetCurrentDisplayProc>(
       GetGLProcAddress("glXGetCurrentDisplay"));
   fn.glXGetCurrentDrawableFn = reinterpret_cast<glXGetCurrentDrawableProc>(
       GetGLProcAddress("glXGetCurrentDrawable"));
   fn.glXGetCurrentReadDrawableFn =
       reinterpret_cast<glXGetCurrentReadDrawableProc>(
           GetGLProcAddress("glXGetCurrentReadDrawable"));
   fn.glXGetFBConfigAttribFn = reinterpret_cast<glXGetFBConfigAttribProc>(
       GetGLProcAddress("glXGetFBConfigAttrib"));
-  fn.glXGetFBConfigFromVisualSGIXFn =
-      reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>(
-          GetGLProcAddress("glXGetFBConfigFromVisualSGIX"));
+  fn.glXGetFBConfigFromVisualSGIXFn = 0;
   fn.glXGetFBConfigsFn = reinterpret_cast<glXGetFBConfigsProc>(
       GetGLProcAddress("glXGetFBConfigs"));
-  fn.glXGetMscRateOMLFn = reinterpret_cast<glXGetMscRateOMLProc>(
-      GetGLProcAddress("glXGetMscRateOML"));
+  fn.glXGetMscRateOMLFn = 0;
   fn.glXGetSelectedEventFn = reinterpret_cast<glXGetSelectedEventProc>(
       GetGLProcAddress("glXGetSelectedEvent"));
-  fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>(
-      GetGLProcAddress("glXGetSyncValuesOML"));
+  fn.glXGetSyncValuesOMLFn = 0;
   fn.glXGetVisualFromFBConfigFn =
       reinterpret_cast<glXGetVisualFromFBConfigProc>(
           GetGLProcAddress("glXGetVisualFromFBConfig"));
   fn.glXIsDirectFn =
       reinterpret_cast<glXIsDirectProc>(GetGLProcAddress("glXIsDirect"));
   fn.glXMakeContextCurrentFn = reinterpret_cast<glXMakeContextCurrentProc>(
       GetGLProcAddress("glXMakeContextCurrent"));
   fn.glXMakeCurrentFn =
       reinterpret_cast<glXMakeCurrentProc>(GetGLProcAddress("glXMakeCurrent"));
   fn.glXQueryContextFn = reinterpret_cast<glXQueryContextProc>(
       GetGLProcAddress("glXQueryContext"));
   fn.glXQueryDrawableFn = reinterpret_cast<glXQueryDrawableProc>(
       GetGLProcAddress("glXQueryDrawable"));
   fn.glXQueryExtensionFn = reinterpret_cast<glXQueryExtensionProc>(
       GetGLProcAddress("glXQueryExtension"));
   fn.glXQueryExtensionsStringFn =
       reinterpret_cast<glXQueryExtensionsStringProc>(
           GetGLProcAddress("glXQueryExtensionsString"));
   fn.glXQueryServerStringFn = reinterpret_cast<glXQueryServerStringProc>(
       GetGLProcAddress("glXQueryServerString"));
   fn.glXQueryVersionFn = reinterpret_cast<glXQueryVersionProc>(
       GetGLProcAddress("glXQueryVersion"));
-  fn.glXReleaseTexImageEXTFn = reinterpret_cast<glXReleaseTexImageEXTProc>(
-      GetGLProcAddress("glXReleaseTexImageEXT"));
+  fn.glXReleaseTexImageEXTFn = 0;
   fn.glXSelectEventFn =
       reinterpret_cast<glXSelectEventProc>(GetGLProcAddress("glXSelectEvent"));
   fn.glXSwapBuffersFn =
       reinterpret_cast<glXSwapBuffersProc>(GetGLProcAddress("glXSwapBuffers"));
-  fn.glXSwapIntervalEXTFn = reinterpret_cast<glXSwapIntervalEXTProc>(
-      GetGLProcAddress("glXSwapIntervalEXT"));
-  fn.glXSwapIntervalMESAFn = reinterpret_cast<glXSwapIntervalMESAProc>(
-      GetGLProcAddress("glXSwapIntervalMESA"));
+  fn.glXSwapIntervalEXTFn = 0;
+  fn.glXSwapIntervalMESAFn = 0;
   fn.glXUseXFontFn =
       reinterpret_cast<glXUseXFontProc>(GetGLProcAddress("glXUseXFont"));
   fn.glXWaitGLFn =
       reinterpret_cast<glXWaitGLProc>(GetGLProcAddress("glXWaitGL"));
-  fn.glXWaitVideoSyncSGIFn = reinterpret_cast<glXWaitVideoSyncSGIProc>(
-      GetGLProcAddress("glXWaitVideoSyncSGI"));
+  fn.glXWaitVideoSyncSGIFn = 0;
   fn.glXWaitXFn = reinterpret_cast<glXWaitXProc>(GetGLProcAddress("glXWaitX"));
-}
-
-void DriverGLX::InitializeDynamicBindings(GLContext* context) {
-  DCHECK(context && context->IsCurrent(NULL));
-  const GLVersionInfo* ver = context->GetVersionInfo();
-  ALLOW_UNUSED_LOCAL(ver);
-  std::string extensions = context->GetExtensions() + " ";
+  std::string extensions(GetPlatformExtensions());
+  extensions += " ";
   ALLOW_UNUSED_LOCAL(extensions);
 
   ext.b_GLX_ARB_create_context =
       extensions.find("GLX_ARB_create_context ") != std::string::npos;
   ext.b_GLX_EXT_swap_control =
       extensions.find("GLX_EXT_swap_control ") != std::string::npos;
   ext.b_GLX_EXT_texture_from_pixmap =
       extensions.find("GLX_EXT_texture_from_pixmap ") != std::string::npos;
   ext.b_GLX_MESA_copy_sub_buffer =
       extensions.find("GLX_MESA_copy_sub_buffer ") != std::string::npos;
   ext.b_GLX_MESA_swap_control =
       extensions.find("GLX_MESA_swap_control ") != std::string::npos;
   ext.b_GLX_OML_sync_control =
       extensions.find("GLX_OML_sync_control ") != std::string::npos;
   ext.b_GLX_SGIX_fbconfig =
       extensions.find("GLX_SGIX_fbconfig ") != std::string::npos;
   ext.b_GLX_SGI_video_sync =
       extensions.find("GLX_SGI_video_sync ") != std::string::npos;
 
+  debug_fn.glXBindTexImageEXTFn = 0;
+  if (ext.b_GLX_EXT_texture_from_pixmap) {
+    fn.glXBindTexImageEXTFn = reinterpret_cast<glXBindTexImageEXTProc>(
+        GetGLProcAddress("glXBindTexImageEXT"));
+    DCHECK(fn.glXBindTexImageEXTFn);
+  }
+
+  debug_fn.glXCopySubBufferMESAFn = 0;
+  if (ext.b_GLX_MESA_copy_sub_buffer) {
+    fn.glXCopySubBufferMESAFn = reinterpret_cast<glXCopySubBufferMESAProc>(
+        GetGLProcAddress("glXCopySubBufferMESA"));
+    DCHECK(fn.glXCopySubBufferMESAFn);
+  }
+
+  debug_fn.glXCreateContextAttribsARBFn = 0;
+  if (ext.b_GLX_ARB_create_context) {
+    fn.glXCreateContextAttribsARBFn =
+        reinterpret_cast<glXCreateContextAttribsARBProc>(
+            GetGLProcAddress("glXCreateContextAttribsARB"));
+    DCHECK(fn.glXCreateContextAttribsARBFn);
+  }
+
+  debug_fn.glXGetFBConfigFromVisualSGIXFn = 0;
+  if (ext.b_GLX_SGIX_fbconfig) {
+    fn.glXGetFBConfigFromVisualSGIXFn =
+        reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>(
+            GetGLProcAddress("glXGetFBConfigFromVisualSGIX"));
+    DCHECK(fn.glXGetFBConfigFromVisualSGIXFn);
+  }
+
+  debug_fn.glXGetMscRateOMLFn = 0;
+  if (ext.b_GLX_OML_sync_control) {
+    fn.glXGetMscRateOMLFn = reinterpret_cast<glXGetMscRateOMLProc>(
+        GetGLProcAddress("glXGetMscRateOML"));
+    DCHECK(fn.glXGetMscRateOMLFn);
+  }
+
+  debug_fn.glXGetSyncValuesOMLFn = 0;
+  if (ext.b_GLX_OML_sync_control) {
+    fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>(
+        GetGLProcAddress("glXGetSyncValuesOML"));
+    DCHECK(fn.glXGetSyncValuesOMLFn);
+  }
+
+  debug_fn.glXReleaseTexImageEXTFn = 0;
+  if (ext.b_GLX_EXT_texture_from_pixmap) {
+    fn.glXReleaseTexImageEXTFn = reinterpret_cast<glXReleaseTexImageEXTProc>(
+        GetGLProcAddress("glXReleaseTexImageEXT"));
+    DCHECK(fn.glXReleaseTexImageEXTFn);
+  }
+
+  debug_fn.glXSwapIntervalEXTFn = 0;
+  if (ext.b_GLX_EXT_swap_control) {
+    fn.glXSwapIntervalEXTFn = reinterpret_cast<glXSwapIntervalEXTProc>(
+        GetGLProcAddress("glXSwapIntervalEXT"));
+    DCHECK(fn.glXSwapIntervalEXTFn);
+  }
+
+  debug_fn.glXSwapIntervalMESAFn = 0;
+  if (ext.b_GLX_MESA_swap_control) {
+    fn.glXSwapIntervalMESAFn = reinterpret_cast<glXSwapIntervalMESAProc>(
+        GetGLProcAddress("glXSwapIntervalMESA"));
+    DCHECK(fn.glXSwapIntervalMESAFn);
+  }
+
+  debug_fn.glXWaitVideoSyncSGIFn = 0;
+  if (ext.b_GLX_SGI_video_sync) {
+    fn.glXWaitVideoSyncSGIFn = reinterpret_cast<glXWaitVideoSyncSGIProc>(
+        GetGLProcAddress("glXWaitVideoSyncSGI"));
+    DCHECK(fn.glXWaitVideoSyncSGIFn);
+  }
+
   if (g_debugBindingsInitialized)
     InitializeDebugBindings();
 }
 
 extern "C" {
 
 static void GL_BINDING_CALL Debug_glXBindTexImageEXT(Display* dpy,
                                                      GLXDrawable drawable,
                                                      int buffer,
                                                      int* attribList) {
@@ skipping 1291 matching lines @@
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXWaitVideoSyncSGI")
   return glx_api_->glXWaitVideoSyncSGIFn(divisor, remainder, count);
 }
 
 void TraceGLXApi::glXWaitXFn(void) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXWaitX")
   glx_api_->glXWaitXFn();
 }
 
 }  // namespace gfx