Take GL version and extensions correctly into account when binding functions

ui/gl/gl_implementation.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 "ui/gl/gl_implementation.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/at_exit.h"
@@ skipping 28 matching lines @@
 void CleanupNativeLibraries(void* unused) {
   if (g_libraries) {
     // We do not call base::UnloadNativeLibrary() for these libraries as
     // unloading libGL without closing X display is not allowed. See
     // crbug.com/250813 for details.
     delete g_libraries;
     g_libraries = NULL;
   }
 }
 
-bool ExportsCoreFunctionsFromGetProcAddress(GLImplementation implementation) {
-  switch (GetGLImplementation()) {
-    case kGLImplementationDesktopGL:
-    case kGLImplementationOSMesaGL:
-    case kGLImplementationAppleGL:
-    case kGLImplementationMockGL:
-      return true;
-    case kGLImplementationEGLGLES2:
-      return false;
-    default:
-      NOTREACHED();
-      return true;
-  }
-}
-
 }
 
 base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls = NULL;
 OSMESAApi* g_current_osmesa_context;
 
 #if defined(OS_WIN)
 
 EGLApi* g_current_egl_context;
 WGLApi* g_current_wgl_context;
 
@@ skipping 57 matching lines @@
 
 void UnloadGLNativeLibraries() {
   CleanupNativeLibraries(NULL);
 }
 
 void SetGLGetProcAddressProc(GLGetProcAddressProc proc) {
   DCHECK(proc);
   g_get_proc_address = proc;
 }
 
-void* GetGLCoreProcAddress(const char* name) {
+void* GetGLProcAddress(const char* name) {
   DCHECK(g_gl_implementation != kGLImplementationNone);
 
   if (g_libraries) {
     for (size_t i = 0; i < g_libraries->size(); ++i) {
       void* proc = base::GetFunctionPointerFromNativeLibrary((*g_libraries)[i],
                                                              name);
       if (proc)
         return proc;
     }
   }
-  if (ExportsCoreFunctionsFromGetProcAddress(g_gl_implementation) &&
-      g_get_proc_address) {
+  if (g_get_proc_address) {
     void* proc = g_get_proc_address(name);
     if (proc)
       return proc;
   }
 
   return NULL;
 }
 
-void* GetGLProcAddress(const char* name) {
-  DCHECK(g_gl_implementation != kGLImplementationNone);
-
-  void* proc = GetGLCoreProcAddress(name);
-  if (!proc && g_get_proc_address) {
-    proc = g_get_proc_address(name);
-    if (proc)
-      return proc;
-  }
-
-  return proc;
-}
-
 void InitializeNullDrawGLBindings() {
   // This is platform independent, so it does not need to live in a platform
   // specific implementation file.
   InitializeNullDrawGLBindingsGL();
 }
 
 }  // namespace gfx