Refactor GL bindings so there is no global GLApi or DriverGL.

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 2538 matching lines @@
 """
 
 #include <string>
 
 %s
 
 namespace gl {
 """ % includes_string)
 
   file.write('\n')
-  file.write('static bool g_debugBindingsInitialized;\n')
-  file.write('Driver%s g_driver_%s;\n' % (set_name.upper(), set_name.lower()))
+  if set_name != 'gl':
+    file.write('Driver%s g_driver_%s;\n' % (set_name.upper(), set_name.lower()))
   file.write('\n')
 
   # Write stub functions that take the place of some functions before a context
   # is initialized. This is done to provide clear asserts on debug build and to
   # avoid crashing in case of a bug on release build.
   file.write('\n')
   num_dynamic = 0
   for func in functions:
     static_binding = GetStaticBinding(func)
     if static_binding:
@@ skipping 72 matching lines @@
     if 'client_extensions' in func['versions'][0]:
       assert len(func['versions']) == 1
       return True
     return False
 
   file.write("}\n\n");
 
   if set_name == 'gl':
     file.write("""\
 void DriverGL::InitializeDynamicBindings(
-    GLContext* context) {
-  DCHECK(context && context->IsCurrent(NULL));
-  const GLVersionInfo* ver = context->GetVersionInfo();
-  ALLOW_UNUSED_LOCAL(ver);
-  std::string extensions = context->GetExtensions() + " ";
+    const GLVersionInfo* ver, const std::string& context_extensions) {
+  std::string extensions = context_extensions + " ";
   ALLOW_UNUSED_LOCAL(extensions);
 
 """)
   elif set_name == 'egl':
     file.write("""\
 void DriverEGL::InitializeClientExtensionBindings() {
   std::string client_extensions(GetClientExtensions());
   client_extensions += " ";
   ALLOW_UNUSED_LOCAL(client_extensions);
 
@@ skipping 10 matching lines @@
   def OutputExtensionBindings(extension_var, extensions, extension_funcs):
     # Extra space at the end of the extension name is intentional,
     # it is used as a separator
     for extension in extensions:
       file.write('  ext.b_%s = %s.find("%s ") != std::string::npos;\n' %
                  (extension, extension_var, extension))
 
     for func in extension_funcs:
       if not 'static_binding' in func:
         file.write('\n')
-        file.write('  debug_fn.%sFn = 0;\n' % func['known_as'])
         WriteConditionalFuncBinding(file, func)
 
   OutputExtensionBindings(
     'client_extensions',
     sorted(used_client_extensions),
     [ f for f in functions if IsClientExtensionFunc(f) ])
 
   if set_name == 'egl':
     file.write("""\
 }
 
 void DriverEGL::InitializeExtensionBindings() {
   std::string extensions(GetPlatformExtensions());
   extensions += " ";
   ALLOW_UNUSED_LOCAL(extensions);
 
 """)
 
   OutputExtensionBindings(
     'extensions',
     sorted(used_extensions),
     [ f for f in functions if not IsClientExtensionFunc(f) ])
+  file.write('}\n')
 
-  # Some new function pointers have been added, so update them in debug bindings
+  # Write function to clear all function pointers.
   file.write('\n')
-  file.write('  if (g_debugBindingsInitialized)\n')
-  file.write('    InitializeDebugBindings();\n')
-  file.write('}\n')
-  file.write('\n')
+  file.write("""void Driver%s::ClearBindings() {
+  memset(this, 0, sizeof(*this));
+}
+""" % set_name.upper())
 
-  # Write logging wrappers for each function.
-  file.write('extern "C" {\n')
+  def MakeArgNames(arguments):
+    argument_names = re.sub(
+        r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', arguments)
+    argument_names = re.sub(
+        r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', argument_names)
+    if argument_names == 'void' or argument_names == '':
+      argument_names = ''
+    return argument_names
+
+  # Write GLApiBase functions
+  for func in functions:
+    function_name = func['known_as']
+    return_type = func['return_type']
+    arguments = func['arguments']
+    file.write('\n')
+    file.write('%s %sApiBase::%sFn(%s) {\n' %
+        (return_type, set_name.upper(), function_name, arguments))
+    argument_names = MakeArgNames(arguments)
+    if return_type == 'void':
+      file.write('  driver_->fn.%sFn(%s);\n' %
+          (function_name, argument_names))
+    else:
+      file.write('  return driver_->fn.%sFn(%s);\n' %
+          (function_name, argument_names))
+    file.write('}\n')
+
+  # Write TraceGLApi functions
+  for func in functions:
+    function_name = func['known_as']
+    return_type = func['return_type']
+    arguments = func['arguments']
+    file.write('\n')
+    file.write('%s Trace%sApi::%sFn(%s) {\n' %
+        (return_type, set_name.upper(), function_name, arguments))
+    argument_names = MakeArgNames(arguments)
+    file.write('  TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::%s")\n' %
+               function_name)
+    if return_type == 'void':
+      file.write('  %s_api_->%sFn(%s);\n' %
+          (set_name.lower(), function_name, argument_names))
+    else:
+      file.write('  return %s_api_->%sFn(%s);\n' %
+          (set_name.lower(), function_name, argument_names))
+    file.write('}\n')
+
+  # Write DebugGLApi functions
   for func in functions:
     return_type = func['return_type']
     arguments = func['arguments']
     file.write('\n')
-    file.write('static %s GL_BINDING_CALL Debug_%s(%s) {\n' %
-        (return_type, func['known_as'], arguments))
+    file.write('%s Debug%sApi::%sFn(%s) {\n' %
+        (return_type, set_name.upper(), func['known_as'], arguments))
     argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', arguments)
     argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', argument_names)
     log_argument_names = re.sub(
         r'const char\* ([a-zA-Z0-9_]+)', r'CONSTCHAR_\1', arguments)
     log_argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\* ([a-zA-Z0-9_]+)',
         r'CONSTVOID_\2', log_argument_names)
     log_argument_names = re.sub(
@@ skipping 20 matching lines @@
     log_argument_names = log_argument_names.replace(',', ' << ", " <<')
     if argument_names == 'void' or argument_names == '':
       argument_names = ''
       log_argument_names = ''
     else:
       log_argument_names = " << " + log_argument_names
     function_name = func['known_as']
     if return_type == 'void':
       file.write('  GL_SERVICE_LOG("%s" << "(" %s << ")");\n' %
           (function_name, log_argument_names))
-      file.write('  DCHECK(g_driver_%s.debug_fn.%sFn != nullptr);\n' %
-          (set_name.lower(), function_name))
-      file.write('  g_driver_%s.debug_fn.%sFn(%s);\n' %
+      file.write('  %s_api_->%sFn(%s);\n' %
           (set_name.lower(), function_name, argument_names))
       if 'logging_code' in func:
         file.write("%s\n" % func['logging_code'])
       if options.generate_dchecks and set_name == 'gl':
         file.write('  {\n')
-        file.write('    GLenum error = g_driver_gl.debug_fn.glGetErrorFn();\n')
+        file.write('    GLenum error = %s_api_->glGetErrorFn();\n'
+            % set_name.lower())
         file.write('    DCHECK(error == 0);\n')
         file.write('  }\n')
     else:
       file.write('  GL_SERVICE_LOG("%s" << "(" %s << ")");\n' %
           (function_name, log_argument_names))
-      file.write('  DCHECK(g_driver_%s.debug_fn.%sFn != nullptr);\n' %
-          (set_name.lower(), function_name))
-      file.write('  %s result = g_driver_%s.debug_fn.%sFn(%s);\n' %
+      file.write('  %s result = %s_api_->%sFn(%s);\n' %
           (return_type, set_name.lower(), function_name, argument_names))
       if 'logging_code' in func:
         file.write("%s\n" % func['logging_code'])
       else:
         file.write('  GL_SERVICE_LOG("GL_RESULT: " << result);\n')
       if options.generate_dchecks and set_name == 'gl':
         file.write('  {\n')
-        file.write('    GLenum _error = g_driver_gl.debug_fn.glGetErrorFn();\n')
+        file.write('    GLenum _error = %s_api_->glGetErrorFn();\n' %
+            set_name.lower())
         file.write('    DCHECK(_error == 0);\n')
         file.write('  }\n')
       file.write('  return result;\n')
     file.write('}\n')
-  file.write('}  // extern "C"\n')
-
-  # Write function to initialize the debug function pointers.
-  file.write('\n')
-  file.write('void Driver%s::InitializeDebugBindings() {\n' %
-             set_name.upper())
-  for func in functions:
-    first_name = func['known_as']
-    file.write('  if (!debug_fn.%sFn) {\n' % first_name)
-    file.write('    debug_fn.%sFn = fn.%sFn;\n' % (first_name, first_name))
-    file.write('    fn.%sFn = Debug_%s;\n' % (first_name, first_name))
-    file.write('  }\n')
-  file.write('  g_debugBindingsInitialized = true;\n')
-  file.write('}\n')
-
-  # Write function to clear all function pointers.
-  file.write('\n')
-  file.write("""void Driver%s::ClearBindings() {
-  memset(this, 0, sizeof(*this));
-}
-""" % set_name.upper())
-
-  def MakeArgNames(arguments):
-    argument_names = re.sub(
-        r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', arguments)
-    argument_names = re.sub(
-        r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', argument_names)
-    if argument_names == 'void' or argument_names == '':
-      argument_names = ''
-    return argument_names
-
-  # Write GLApiBase functions
-  for func in functions:
-    function_name = func['known_as']
-    return_type = func['return_type']
-    arguments = func['arguments']
-    file.write('\n')
-    file.write('%s %sApiBase::%sFn(%s) {\n' %
-        (return_type, set_name.upper(), function_name, arguments))
-    argument_names = MakeArgNames(arguments)
-    if return_type == 'void':
-      file.write('  driver_->fn.%sFn(%s);\n' %
-          (function_name, argument_names))
-    else:
-      file.write('  return driver_->fn.%sFn(%s);\n' %
-          (function_name, argument_names))
-    file.write('}\n')
-
-  # Write TraceGLApi functions
-  for func in functions:
-    function_name = func['known_as']
-    return_type = func['return_type']
-    arguments = func['arguments']
-    file.write('\n')
-    file.write('%s Trace%sApi::%sFn(%s) {\n' %
-        (return_type, set_name.upper(), function_name, arguments))
-    argument_names = MakeArgNames(arguments)
-    file.write('  TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::%s")\n' %
-               function_name)
-    if return_type == 'void':
-      file.write('  %s_api_->%sFn(%s);\n' %
-          (set_name.lower(), function_name, argument_names))
-    else:
-      file.write('  return %s_api_->%sFn(%s);\n' %
-          (set_name.lower(), function_name, argument_names))
-    file.write('}\n')
 
   # Write NoContextGLApi functions
   if set_name.upper() == "GL":
     for func in functions:
       function_name = func['known_as']
       return_type = func['return_type']
       arguments = func['arguments']
       file.write('\n')
       file.write('%s NoContextGLApi::%sFn(%s) {\n' %
           (return_type, function_name, arguments))
@@ skipping 513 matching lines @@
     header_file = open(
         os.path.join(directory, 'gl_stub_autogen_gl.cc'), 'wb')
     GenerateStubSource(header_file, GL_FUNCTIONS)
     header_file.close()
     ClangFormat(header_file.name)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))