Take GL version and extensions correctly into account when binding functions

ui/gl/gl_implementation_mac.cc

Index: ui/gl/gl_implementation_mac.cc
diff --git a/ui/gl/gl_implementation_mac.cc b/ui/gl/gl_implementation_mac.cc
index 36bb7e37e503a1e1ebec8ec869ad98e0c8441ece..41a759cce831e156b0d024ea5cc90cb827954163 100644
--- a/ui/gl/gl_implementation_mac.cc
+++ b/ui/gl/gl_implementation_mac.cc
@@ -10,6 +10,7 @@
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
 #include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context_mock_version.h"
 #include "ui/gl/gl_gl_api_implementation.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
@@ -26,7 +27,7 @@ void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
   impls->push_back(kGLImplementationOSMesaGL);
 }
 
-bool InitializeGLBindings(GLImplementation implementation) {
+bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
   // unit tests have initialized with kGLImplementationMock, we don't want to
   // later switch to another GL implementation.
@@ -77,8 +78,8 @@ bool InitializeGLBindings(GLImplementation implementation) {
       AddGLNativeLibrary(library);
       SetGLImplementation(kGLImplementationOSMesaGL);
 
-      InitializeGLBindingsGL();
-      InitializeGLBindingsOSMESA();
+      InitializeStaticGLBindingsGL();
+      InitializeStaticGLBindingsOSMESA();
       break;
     }
     case kGLImplementationDesktopGL:
@@ -93,13 +94,13 @@ bool InitializeGLBindings(GLImplementation implementation) {
       AddGLNativeLibrary(library);
       SetGLImplementation(implementation);
 
-      InitializeGLBindingsGL();
+      InitializeStaticGLBindingsGL();
       break;
     }
     case kGLImplementationMockGL: {
       SetGLGetProcAddressProc(GetMockGLProcAddress);
       SetGLImplementation(kGLImplementationMockGL);
-      InitializeGLBindingsGL();
+      InitializeStaticGLBindingsGL();
       break;
     }
     default:
@@ -109,19 +110,23 @@ bool InitializeGLBindings(GLImplementation implementation) {
   return true;
 }
 
-bool InitializeGLExtensionBindings(GLImplementation implementation,
+bool InitializeDynamicGLBindings(GLImplementation implementation,
     GLContext* context) {
   switch (implementation) {
     case kGLImplementationOSMesaGL:
-      InitializeGLExtensionBindingsGL(context);
-      InitializeGLExtensionBindingsOSMESA(context);
+      InitializeDynamicGLBindingsGL(context);
+      InitializeDynamicGLBindingsOSMESA(context);
       break;
     case kGLImplementationDesktopGL:
     case kGLImplementationAppleGL:
-      InitializeGLExtensionBindingsGL(context);
+      InitializeDynamicGLBindingsGL(context);
       break;
     case kGLImplementationMockGL:
-      InitializeGLExtensionBindingsGL(context);
+      {
+        scoped_refptr<GLContextMockVersion> mock_context(
+            new GLContextMockVersion("3.0"));

[Ken Russell (switch to Gerrit), 2013/12/04 02:30:51]

Not sure 3.0 is a good default, given that Chromium currently relies on using
OpenGL 2.1 + extensions on desktop configurations. Work will need to be done to
upgrade to the 3.x core profile.

[oetuaho, 2013/12/04 13:05:36]

Since the unit tests don't specify an extension string for the bindings but some
bindings do require either an extension or GL 3.0+, putting anything less than
3.0 here could break some of the unit tests, or require lots of changes to the
unit tests. I do think that the unit tests could be set up better, but I'd say
that can go to a separate patch. I didn't have other very strong reasons to set
the 4.0/3.0 versions the way I did, though, I could make it 3.0 across the
board.

If Chrome requires OpenGL 2.1+, that could be explicitly specified when calling
glXCreateContextAttribsARB and wglCreateContextAttribsARB, by the way. It would
make it clearer what feature level is required.

+        InitializeDynamicGLBindingsGL(mock_context.get());
+      }
       break;
     default:
       return false;