Respect the disabled extension list during binding initialization.

ui/gl/generate_bindings.py

 #!/usr/bin/env python
 # 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.
 
 """code generator for GL/GLES extension wrangler."""
 
 import optparse
 import os
 import collections
@@ skipping 1887 matching lines @@
       first_version = False
 
   # TODO(jmadill): make more robust
   def IsClientExtensionFunc(func):
     assert len(func['versions']) > 0
     if 'client_extensions' in func['versions'][0]:
       assert len(func['versions']) == 1
       return True
     return False
 
-  if set_name == 'egl':
-    file.write("""std::string client_extensions(GetClientExtensions());
-  client_extensions += " ";
-  ALLOW_UNUSED_LOCAL(client_extensions);
-
-""")
-    for extension in sorted(used_client_extensions):
-      # Extra space at the end of the extension name is intentional,
-      # it is used as a separator
-      file.write(
-          '  ext.b_%s = client_extensions.find("%s ") != std::string::npos;\n' %
-          (extension, extension))
-    for func in functions:
-      if not 'static_binding' in func and IsClientExtensionFunc(func):
-        file.write('\n')
-        file.write('  debug_fn.%sFn = 0;\n' % func['known_as'])
-        WriteConditionalFuncBinding(file, func)
+  file.write("}\n\n");
 
   if set_name == 'gl':
-    # Write the deferred bindings for GL that need a current context and depend
-    # on GL_VERSION and GL_EXTENSIONS.
-    file.write('}\n\n')
-    file.write("""void DriverGL::InitializeDynamicBindings(GLContext* context) {
+    file.write("""\
+void DriverGL::InitializeExtensionBindings(
+    GLContext* context,
+    const std::set<std::string> &enabled_extensions) {
   DCHECK(context && context->IsCurrent(NULL));
   const GLVersionInfo* ver = context->GetVersionInfo();
   ALLOW_UNUSED_LOCAL(ver);
-  std::string extensions = context->GetExtensions() + " ";
-  ALLOW_UNUSED_LOCAL(extensions);
-
 """)
   else:
-    file.write("""std::string extensions(GetPlatformExtensions());
-  extensions += " ";
-  ALLOW_UNUSED_LOCAL(extensions);
+    file.write("""\
+void Driver%s::InitializeExtensionBindings(
+    const std::set<std::string> &enabled_extensions) {
+""" % (set_name.upper(),))
 
-""")
+  for extension in sorted(used_client_extensions) + sorted(used_extensions):
+    # Extra space at the end of the extension name is intentional,
+    # it is used as a separator
+    file.write('ext.b_{0} = enabled_extensions.find("{0}") != enabled_extensions.end();'.format(
+      extension))
 
-  for extension in sorted(used_extensions):
-    # Extra space at the end of the extension name is intentional, it is used
-    # as a separator
-    file.write('  ext.b_%s = extensions.find("%s ") != std::string::npos;\n' %
-        (extension, extension))
-
-  for func in functions:
-    if not 'static_binding' in func and not IsClientExtensionFunc(func):
+  for func in sorted(functions, key = lambda func: not IsClientExtensionFunc(func)):
+    if not 'static_binding' in func:
       file.write('\n')
       file.write('  debug_fn.%sFn = 0;\n' % func['known_as'])
       WriteConditionalFuncBinding(file, func)
 
   # Some new function pointers have been added, so update them in debug bindings
   file.write('\n')
   file.write('  if (g_debugBindingsInitialized)\n')
   file.write('    InitializeDebugBindings();\n')
   file.write('}\n')
   file.write('\n')
@@ skipping 644 matching lines @@
                                     'gl_enums_implementation_autogen.h'),
                        'wb')
     GenerateEnumUtils(header_file, enum_header_filenames)
     header_file.close()
     ClangFormat(header_file.name)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))