Take GL version and extensions correctly into account when binding functions

ui/gl/gl_bindings.h

 // 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.
 
 #ifndef UI_GL_GL_BINDINGS_H_
 #define UI_GL_GL_BINDINGS_H_
 
 // Includes the platform independent and platform dependent GL headers.
 // Only include this in cc files. It pulls in system headers, including
 // the X11 headers on linux, which define all kinds of macros that are
@@ skipping 207 matching lines @@
 #include "gl_bindings_autogen_glx.h"
 #elif defined(USE_OZONE)
 #include "gl_bindings_autogen_egl.h"
 #elif defined(OS_ANDROID)
 #include "gl_bindings_autogen_egl.h"
 #endif
 
 namespace gfx {
 
 struct GL_EXPORT DriverGL {
-  void Initialize();
-  void InitializeExtensions(GLContext* context);
+  void InitializeStaticBindings();
+  void InitializeDynamic(GLContext* context);

[no sievers, 2013/12/05 20:51:57]

nit: InitializeDynamicBindings()

[oetuaho, 2013/12/09 17:17:07]

This is intentional - the InitializeDynamicBindings is private here, like
InitializeExtensionBindings was before, since the initialization needs to do
some additional work on top of the auto-generated code. But InitializeDynamic is
a bit weird as a name, so I think I'll change it to
InitializeCustomDynamicBindings which communicates what it does a bit better.

   void InitializeDebugBindings();
   void ClearBindings();
-  void UpdateDebugExtensionBindings();
 
   ProcsGL fn;
   ProcsGL orig_fn;
   ProcsGL debug_fn;
   ExtensionsGL ext;
 
  private:
-  void InitializeBindings();
-  void InitializeExtensionBindings(GLContext* context);
+  void InitializeDynamicBindings(GLContext* context);
 };
 
 struct GL_EXPORT DriverOSMESA {
-  void InitializeBindings();
-  void InitializeExtensionBindings(GLContext* context);
+  void InitializeStaticBindings();
+  void InitializeDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void ClearBindings();
-  void UpdateDebugExtensionBindings();
 
   ProcsOSMESA fn;
   ProcsOSMESA debug_fn;
   ExtensionsOSMESA ext;
 };
 
 #if defined(OS_WIN)
 struct GL_EXPORT DriverWGL {
-  void InitializeBindings();
-  void InitializeExtensionBindings(GLContext* context);
+  void InitializeStaticBindings();
+  void InitializeDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void ClearBindings();
-  void UpdateDebugExtensionBindings();
 
   ProcsWGL fn;
   ProcsWGL debug_fn;
   ExtensionsWGL ext;
 };
 #endif
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
 struct GL_EXPORT DriverEGL {
-  void InitializeBindings();
-  void InitializeExtensionBindings(GLContext* context);
+  void InitializeStaticBindings();
+  void InitializeDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void ClearBindings();
-  void UpdateDebugExtensionBindings();
 
   ProcsEGL fn;
   ProcsEGL debug_fn;
   ExtensionsEGL ext;
 };
 #endif
 
 #if defined(USE_X11)
 struct GL_EXPORT DriverGLX {
-  void InitializeBindings();
-  void InitializeExtensionBindings(GLContext* context);
+  void InitializeStaticBindings();
+  void InitializeDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void ClearBindings();
-  void UpdateDebugExtensionBindings();
 
   ProcsGLX fn;
   ProcsGLX debug_fn;
   ExtensionsGLX ext;
 };
 #endif
 
 // This #define is here to support autogenerated code.
 #define g_current_gl_context g_current_gl_context_tls->Get()
 GL_EXPORT extern base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls;
@@ skipping 27 matching lines @@
 GL_EXPORT extern DriverEGL g_driver_egl;
 
 #endif
 
 // Find an entry point to the mock GL implementation.
 void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_BINDINGS_H_