Revert of Make GL bindings conditional

ui/gl/gl_bindings_autogen_egl.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!
 
@@ skipping 12 matching lines @@
 static bool g_debugBindingsInitialized;
 DriverEGL g_driver_egl;
 
 void DriverEGL::InitializeStaticBindings() {
   fn.eglBindAPIFn =
       reinterpret_cast<eglBindAPIProc>(GetGLProcAddress("eglBindAPI"));
   fn.eglBindTexImageFn = reinterpret_cast<eglBindTexImageProc>(
       GetGLProcAddress("eglBindTexImage"));
   fn.eglChooseConfigFn = reinterpret_cast<eglChooseConfigProc>(
       GetGLProcAddress("eglChooseConfig"));
-  fn.eglClientWaitSyncKHRFn = 0;
+  fn.eglClientWaitSyncKHRFn = reinterpret_cast<eglClientWaitSyncKHRProc>(
+      GetGLProcAddress("eglClientWaitSyncKHR"));
   fn.eglCopyBuffersFn =
       reinterpret_cast<eglCopyBuffersProc>(GetGLProcAddress("eglCopyBuffers"));
   fn.eglCreateContextFn = reinterpret_cast<eglCreateContextProc>(
       GetGLProcAddress("eglCreateContext"));
-  fn.eglCreateImageKHRFn = 0;
+  fn.eglCreateImageKHRFn = reinterpret_cast<eglCreateImageKHRProc>(
+      GetGLProcAddress("eglCreateImageKHR"));
   fn.eglCreatePbufferFromClientBufferFn =
       reinterpret_cast<eglCreatePbufferFromClientBufferProc>(
           GetGLProcAddress("eglCreatePbufferFromClientBuffer"));
   fn.eglCreatePbufferSurfaceFn = reinterpret_cast<eglCreatePbufferSurfaceProc>(
       GetGLProcAddress("eglCreatePbufferSurface"));
   fn.eglCreatePixmapSurfaceFn = reinterpret_cast<eglCreatePixmapSurfaceProc>(
       GetGLProcAddress("eglCreatePixmapSurface"));
-  fn.eglCreateSyncKHRFn = 0;
+  fn.eglCreateSyncKHRFn = reinterpret_cast<eglCreateSyncKHRProc>(
+      GetGLProcAddress("eglCreateSyncKHR"));
   fn.eglCreateWindowSurfaceFn = reinterpret_cast<eglCreateWindowSurfaceProc>(
       GetGLProcAddress("eglCreateWindowSurface"));
   fn.eglDestroyContextFn = reinterpret_cast<eglDestroyContextProc>(
       GetGLProcAddress("eglDestroyContext"));
-  fn.eglDestroyImageKHRFn = 0;
+  fn.eglDestroyImageKHRFn = reinterpret_cast<eglDestroyImageKHRProc>(
+      GetGLProcAddress("eglDestroyImageKHR"));
   fn.eglDestroySurfaceFn = reinterpret_cast<eglDestroySurfaceProc>(
       GetGLProcAddress("eglDestroySurface"));
-  fn.eglDestroySyncKHRFn = 0;
+  fn.eglDestroySyncKHRFn = reinterpret_cast<eglDestroySyncKHRProc>(
+      GetGLProcAddress("eglDestroySyncKHR"));
   fn.eglGetConfigAttribFn = reinterpret_cast<eglGetConfigAttribProc>(
       GetGLProcAddress("eglGetConfigAttrib"));
   fn.eglGetConfigsFn =
       reinterpret_cast<eglGetConfigsProc>(GetGLProcAddress("eglGetConfigs"));
   fn.eglGetCurrentContextFn = reinterpret_cast<eglGetCurrentContextProc>(
       GetGLProcAddress("eglGetCurrentContext"));
   fn.eglGetCurrentDisplayFn = reinterpret_cast<eglGetCurrentDisplayProc>(
       GetGLProcAddress("eglGetCurrentDisplay"));
   fn.eglGetCurrentSurfaceFn = reinterpret_cast<eglGetCurrentSurfaceProc>(
       GetGLProcAddress("eglGetCurrentSurface"));
   fn.eglGetDisplayFn =
       reinterpret_cast<eglGetDisplayProc>(GetGLProcAddress("eglGetDisplay"));
   fn.eglGetErrorFn =
       reinterpret_cast<eglGetErrorProc>(GetGLProcAddress("eglGetError"));
-  fn.eglGetPlatformDisplayEXTFn = 0;
+  fn.eglGetPlatformDisplayEXTFn =
+      reinterpret_cast<eglGetPlatformDisplayEXTProc>(
+          GetGLProcAddress("eglGetPlatformDisplayEXT"));
   fn.eglGetProcAddressFn = reinterpret_cast<eglGetProcAddressProc>(
       GetGLProcAddress("eglGetProcAddress"));
-  fn.eglGetSyncAttribKHRFn = 0;
-  fn.eglGetSyncValuesCHROMIUMFn = 0;
+  fn.eglGetSyncAttribKHRFn = reinterpret_cast<eglGetSyncAttribKHRProc>(
+      GetGLProcAddress("eglGetSyncAttribKHR"));
+  fn.eglGetSyncValuesCHROMIUMFn =
+      reinterpret_cast<eglGetSyncValuesCHROMIUMProc>(
+          GetGLProcAddress("eglGetSyncValuesCHROMIUM"));
   fn.eglInitializeFn =
       reinterpret_cast<eglInitializeProc>(GetGLProcAddress("eglInitialize"));
   fn.eglMakeCurrentFn =
       reinterpret_cast<eglMakeCurrentProc>(GetGLProcAddress("eglMakeCurrent"));
-  fn.eglPostSubBufferNVFn = 0;
+  fn.eglPostSubBufferNVFn = reinterpret_cast<eglPostSubBufferNVProc>(
+      GetGLProcAddress("eglPostSubBufferNV"));
   fn.eglQueryAPIFn =
       reinterpret_cast<eglQueryAPIProc>(GetGLProcAddress("eglQueryAPI"));
   fn.eglQueryContextFn = reinterpret_cast<eglQueryContextProc>(
       GetGLProcAddress("eglQueryContext"));
   fn.eglQueryStringFn =
       reinterpret_cast<eglQueryStringProc>(GetGLProcAddress("eglQueryString"));
   fn.eglQuerySurfaceFn = reinterpret_cast<eglQuerySurfaceProc>(
       GetGLProcAddress("eglQuerySurface"));
-  fn.eglQuerySurfacePointerANGLEFn = 0;
+  fn.eglQuerySurfacePointerANGLEFn =
+      reinterpret_cast<eglQuerySurfacePointerANGLEProc>(
+          GetGLProcAddress("eglQuerySurfacePointerANGLE"));
   fn.eglReleaseTexImageFn = reinterpret_cast<eglReleaseTexImageProc>(
       GetGLProcAddress("eglReleaseTexImage"));
   fn.eglReleaseThreadFn = reinterpret_cast<eglReleaseThreadProc>(
       GetGLProcAddress("eglReleaseThread"));
   fn.eglSurfaceAttribFn = reinterpret_cast<eglSurfaceAttribProc>(
       GetGLProcAddress("eglSurfaceAttrib"));
   fn.eglSwapBuffersFn =
       reinterpret_cast<eglSwapBuffersProc>(GetGLProcAddress("eglSwapBuffers"));
   fn.eglSwapIntervalFn = reinterpret_cast<eglSwapIntervalProc>(
       GetGLProcAddress("eglSwapInterval"));
   fn.eglTerminateFn =
       reinterpret_cast<eglTerminateProc>(GetGLProcAddress("eglTerminate"));
   fn.eglWaitClientFn =
       reinterpret_cast<eglWaitClientProc>(GetGLProcAddress("eglWaitClient"));
   fn.eglWaitGLFn =
       reinterpret_cast<eglWaitGLProc>(GetGLProcAddress("eglWaitGL"));
   fn.eglWaitNativeFn =
       reinterpret_cast<eglWaitNativeProc>(GetGLProcAddress("eglWaitNative"));
-  fn.eglWaitSyncKHRFn = 0;
-  std::string extensions(GetPlatformExtensions());
-  extensions += " ";
+  fn.eglWaitSyncKHRFn =
+      reinterpret_cast<eglWaitSyncKHRProc>(GetGLProcAddress("eglWaitSyncKHR"));
+}
+
+void DriverEGL::InitializeDynamicBindings(GLContext* context) {
+  DCHECK(context && context->IsCurrent(NULL));
+  const GLVersionInfo* ver = context->GetVersionInfo();
+  ALLOW_UNUSED_LOCAL(ver);
+  std::string extensions = context->GetExtensions() + " ";
   ALLOW_UNUSED_LOCAL(extensions);
 
   ext.b_EGL_ANGLE_d3d_share_handle_client_buffer =
       extensions.find("EGL_ANGLE_d3d_share_handle_client_buffer ") !=
       std::string::npos;
   ext.b_EGL_ANGLE_platform_angle =
       extensions.find("EGL_ANGLE_platform_angle ") != std::string::npos;
   ext.b_EGL_ANGLE_query_surface_pointer =
       extensions.find("EGL_ANGLE_query_surface_pointer ") != std::string::npos;
   ext.b_EGL_ANGLE_surface_d3d_texture_2d_share_handle =
       extensions.find("EGL_ANGLE_surface_d3d_texture_2d_share_handle ") !=
       std::string::npos;
   ext.b_EGL_CHROMIUM_sync_control =
       extensions.find("EGL_CHROMIUM_sync_control ") != std::string::npos;
   ext.b_EGL_KHR_fence_sync =
       extensions.find("EGL_KHR_fence_sync ") != std::string::npos;
   ext.b_EGL_KHR_gl_texture_2D_image =
       extensions.find("EGL_KHR_gl_texture_2D_image ") != std::string::npos;
-  ext.b_EGL_KHR_image = extensions.find("EGL_KHR_image ") != std::string::npos;
   ext.b_EGL_KHR_image_base =
       extensions.find("EGL_KHR_image_base ") != std::string::npos;
-  ext.b_EGL_KHR_reusable_sync =
-      extensions.find("EGL_KHR_reusable_sync ") != std::string::npos;
   ext.b_EGL_KHR_wait_sync =
       extensions.find("EGL_KHR_wait_sync ") != std::string::npos;
   ext.b_EGL_NV_post_sub_buffer =
       extensions.find("EGL_NV_post_sub_buffer ") != std::string::npos;
 
-  debug_fn.eglClientWaitSyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglClientWaitSyncKHRFn = reinterpret_cast<eglClientWaitSyncKHRProc>(
-        GetGLProcAddress("eglClientWaitSyncKHR"));
-    DCHECK(fn.eglClientWaitSyncKHRFn);
-  }
-
-  debug_fn.eglCreateImageKHRFn = 0;
-  if (ext.b_EGL_KHR_image || ext.b_EGL_KHR_image_base ||
-      ext.b_EGL_KHR_gl_texture_2D_image) {
-    fn.eglCreateImageKHRFn = reinterpret_cast<eglCreateImageKHRProc>(
-        GetGLProcAddress("eglCreateImageKHR"));
-    DCHECK(fn.eglCreateImageKHRFn);
-  }
-
-  debug_fn.eglCreateSyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglCreateSyncKHRFn = reinterpret_cast<eglCreateSyncKHRProc>(
-        GetGLProcAddress("eglCreateSyncKHR"));
-    DCHECK(fn.eglCreateSyncKHRFn);
-  }
-
-  debug_fn.eglDestroyImageKHRFn = 0;
-  if (ext.b_EGL_KHR_image || ext.b_EGL_KHR_image_base) {
-    fn.eglDestroyImageKHRFn = reinterpret_cast<eglDestroyImageKHRProc>(
-        GetGLProcAddress("eglDestroyImageKHR"));
-    DCHECK(fn.eglDestroyImageKHRFn);
-  }
-
-  debug_fn.eglDestroySyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglDestroySyncKHRFn = reinterpret_cast<eglDestroySyncKHRProc>(
-        GetGLProcAddress("eglDestroySyncKHR"));
-    DCHECK(fn.eglDestroySyncKHRFn);
-  }
-
-  debug_fn.eglGetPlatformDisplayEXTFn = 0;
-  if (ext.b_EGL_ANGLE_platform_angle) {
-    fn.eglGetPlatformDisplayEXTFn =
-        reinterpret_cast<eglGetPlatformDisplayEXTProc>(
-            GetGLProcAddress("eglGetPlatformDisplayEXT"));
-    DCHECK(fn.eglGetPlatformDisplayEXTFn);
-  }
-
-  debug_fn.eglGetSyncAttribKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_reusable_sync) {
-    fn.eglGetSyncAttribKHRFn = reinterpret_cast<eglGetSyncAttribKHRProc>(
-        GetGLProcAddress("eglGetSyncAttribKHR"));
-    DCHECK(fn.eglGetSyncAttribKHRFn);
-  }
-
-  debug_fn.eglGetSyncValuesCHROMIUMFn = 0;
-  if (ext.b_EGL_CHROMIUM_sync_control) {
-    fn.eglGetSyncValuesCHROMIUMFn =
-        reinterpret_cast<eglGetSyncValuesCHROMIUMProc>(
-            GetGLProcAddress("eglGetSyncValuesCHROMIUM"));
-    DCHECK(fn.eglGetSyncValuesCHROMIUMFn);
-  }
-
-  debug_fn.eglPostSubBufferNVFn = 0;
-  if (ext.b_EGL_NV_post_sub_buffer) {
-    fn.eglPostSubBufferNVFn = reinterpret_cast<eglPostSubBufferNVProc>(
-        GetGLProcAddress("eglPostSubBufferNV"));
-    DCHECK(fn.eglPostSubBufferNVFn);
-  }
-
-  debug_fn.eglQuerySurfacePointerANGLEFn = 0;
-  if (ext.b_EGL_ANGLE_query_surface_pointer) {
-    fn.eglQuerySurfacePointerANGLEFn =
-        reinterpret_cast<eglQuerySurfacePointerANGLEProc>(
-            GetGLProcAddress("eglQuerySurfacePointerANGLE"));
-    DCHECK(fn.eglQuerySurfacePointerANGLEFn);
-  }
-
-  debug_fn.eglWaitSyncKHRFn = 0;
-  if (ext.b_EGL_KHR_fence_sync || ext.b_EGL_KHR_wait_sync) {
-    fn.eglWaitSyncKHRFn = reinterpret_cast<eglWaitSyncKHRProc>(
-        GetGLProcAddress("eglWaitSyncKHR"));
-    DCHECK(fn.eglWaitSyncKHRFn);
-  }
-
   if (g_debugBindingsInitialized)
     InitializeDebugBindings();
 }
 
 extern "C" {
 
 static EGLBoolean GL_BINDING_CALL Debug_eglBindAPI(EGLenum api) {
   GL_SERVICE_LOG("eglBindAPI"
                  << "(" << api << ")");
   EGLBoolean result = g_driver_egl.debug_fn.eglBindAPIFn(api);
@@ skipping 1256 matching lines @@
 }
 
 EGLint TraceEGLApi::eglWaitSyncKHRFn(EGLDisplay dpy,
                                      EGLSyncKHR sync,
                                      EGLint flags) {
   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::eglWaitSyncKHR")
   return egl_api_->eglWaitSyncKHRFn(dpy, sync, flags);
 }
 
 }  // namespace gfx