Move NullDraw GL bindings and allow them to be disabled temporarily.

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 803 matching lines @@
   'known_as': 'glDiscardFramebufferEXT',
   'versions': [{ 'name': 'glInvalidateFramebuffer',
                  'gl_versions': ['es3'],
                  'extensions': [] },
                { 'name': 'glDiscardFramebufferEXT',
                  'gl_versions': ['es1', 'es2'] }],
   'arguments': 'GLenum target, GLsizei numAttachments, '
       'const GLenum* attachments' },
 ]
 
-GL_NULLDRAW_FUNCTIONS = [
-{ 'return_type': 'void',
-  'names': ['glClear'],
-  'arguments': 'GLbitfield mask', },
-{ 'return_type': 'void',
-  'names': ['glDrawArrays'],
-  'arguments': 'GLenum mode, GLint first, GLsizei count', },
-{ 'return_type': 'void',
-  'names': ['glDrawElements'],
-  'arguments':
-      'GLenum mode, GLsizei count, GLenum type, const void* indices', },
-]
-
 OSMESA_FUNCTIONS = [
 { 'return_type': 'OSMesaContext',
   'names': ['OSMesaCreateContext'],
   'arguments': 'GLenum format, OSMesaContext sharelist', },
 { 'return_type': 'OSMesaContext',
   'names': ['OSMesaCreateContextExt'],
   'arguments':
       'GLenum format, GLint depthBits, GLint stencilBits, GLint accumBits, '
       'OSMesaContext sharelist', },
 { 'return_type': 'void',
@@ skipping 410 matching lines @@
       'Display* dpy, GLXDrawable drawable, int64* ust, int64* msc, '
       'int64* sbc' },
 { 'return_type': 'bool',
   'names': ['glXGetMscRateOML'],
   'arguments':
       'Display* dpy, GLXDrawable drawable, int32* numerator, '
       'int32* denominator' },
 ]
 
 FUNCTION_SETS = [
-  [GL_FUNCTIONS, GL_NULLDRAW_FUNCTIONS, 'gl', [
+  [GL_FUNCTIONS, 'gl', [
       'GL/glext.h',
       'GLES2/gl2ext.h',
       # Files below are Chromium-specific and shipped with Chromium sources.
       'GL/glextchromium.h',
       'GLES2/gl2chromium.h',
       'GLES2/gl2extchromium.h'
   ], []],
-  [OSMESA_FUNCTIONS, [], 'osmesa', [], []],
-  [EGL_FUNCTIONS, [], 'egl', [
+  [OSMESA_FUNCTIONS, 'osmesa', [], []],
+  [EGL_FUNCTIONS, 'egl', [
       'EGL/eglext.h',
       # Files below are Chromium-specific and shipped with Chromium sources.
       'EGL/eglextchromium.h',
     ],
     [
       'EGL_ANGLE_d3d_share_handle_client_buffer',
       'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
     ],
   ],
-  [WGL_FUNCTIONS, [], 'wgl', ['GL/wglext.h'], []],
-  [GLX_FUNCTIONS, [], 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
+  [WGL_FUNCTIONS, 'wgl', ['GL/wglext.h'], []],
+  [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'GL/glxext.h'], []],
 ]
 
 def GenerateHeader(file, functions, set_name, used_extensions):
   """Generates gl_bindings_autogen_x.h"""
 
   # Write file header.
   file.write(
 """// 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.
@@ skipping 100 matching lines @@
       args = ''
     arg_count = 0
     if len(args):
       arg_count = func['arguments'].count(',') + 1
     file.write('  MOCK_METHOD%d(%s, %s(%s));\n' %
       (arg_count, func['known_as'][2:], func['return_type'], args))
 
   file.write('\n')
 
 
-def GenerateSource(
-  file, functions, nulldraw_functions, set_name, used_extensions):
+def GenerateSource(file, functions, set_name, used_extensions):
   """Generates gl_bindings_autogen_x.cc"""
 
   # Write file header.
   file.write(
 """// Copyright (c) 2011 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 automatically generated.
 
@@ skipping 140 matching lines @@
       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')
 
-  # Write empty stubs for functions that want one.
-  file.write('extern "C" {\n')
-  for func in nulldraw_functions:
-    known_as = func['known_as']
-    return_type = func['return_type']
-    arguments = func['arguments']
-    file.write('\n')
-    file.write('static %s GL_BINDING_CALL Stub_%s(%s) {}\n' %
-        (return_type, known_as, arguments))
-  file.write('}  // extern "C"\n')
-
   # Write logging wrappers for each function.
   file.write('extern "C" {\n')
   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))
     argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2', arguments)
@@ skipping 58 matching lines @@
              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 initialize the nulldraw function pointers.
-  if nulldraw_functions:
-    file.write('\n')
-    file.write('void Driver%s::InitializeNullDrawBindings() {\n' %
-               set_name.upper())
-
-    for func in nulldraw_functions:
-      first_name = func['known_as']
-      file.write('  fn.%sFn = Stub_%s;\n' % (first_name, first_name))
-    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())
 
   # Write GLApiBase functions
   for func in functions:
     function_name = func['known_as']
@@ skipping 292 matching lines @@
 def main(argv):
   """This is the main function."""
 
   parser = optparse.OptionParser()
   parser.add_option('--inputs', action='store_true')
   parser.add_option('--header-paths')
 
   options, args = parser.parse_args(argv)
 
   if options.inputs:
-    for [_, _, _, headers, _] in FUNCTION_SETS:
+    for [_, _, headers, _] in FUNCTION_SETS:
       for header in headers:
         print ResolveHeader(header, options.header_paths)
     return 0
 
   directory = '.'
   if len(args) >= 1:
     directory = args[0]
 
-  for [functions,
-       nulldraw_functions,
-       set_name,
-       extension_headers,
-       extensions] in FUNCTION_SETS:
+  for [functions, set_name, extension_headers, extensions] in FUNCTION_SETS:
     # Function names can be specified in two ways (list of unique names or list
     # of versions with different binding conditions). Fill in the data to the
     # versions list in case it is missing, so that can be used from here on:
-    for func in functions + nulldraw_functions:
+    for func in functions:
       assert 'versions' in func or 'names' in func, 'Function with no names'
       if 'versions' not in func:
         func['versions'] = [{'name': n} for n in func['names']]
       # Use the first version's name unless otherwise specified
       if 'known_as' not in func:
         func['known_as'] = func['versions'][0]['name']
       # Make sure that 'names' is not accidentally used instead of 'versions'
       if 'names' in func:
         del func['names']
 
     extension_headers = [ResolveHeader(h, options.header_paths)
                          for h in extension_headers]
     used_extensions = FillExtensionsFromHeaders(
         functions, extension_headers, extensions)
 
     header_file = open(
         os.path.join(directory, 'gl_bindings_autogen_%s.h' % set_name), 'wb')
     GenerateHeader(header_file, functions, set_name, used_extensions)
     header_file.close()
 
     header_file = open(
         os.path.join(directory, 'gl_bindings_api_autogen_%s.h' % set_name),
         'wb')
     GenerateAPIHeader(header_file, functions, set_name)
     header_file.close()
 
     source_file = open(
         os.path.join(directory, 'gl_bindings_autogen_%s.cc' % set_name), 'wb')
-    GenerateSource(source_file,
-                   functions,
-                   nulldraw_functions,
-                   set_name,
-                   used_extensions)
+    GenerateSource(source_file, functions, set_name, used_extensions)
     source_file.close()
 
   header_file = open(
       os.path.join(directory, 'gl_mock_autogen_gl.h'), 'wb')
   GenerateMockHeader(header_file, GL_FUNCTIONS, 'gl')
   header_file.close()
 
   header_file = open(os.path.join(directory, 'gl_bindings_autogen_mock.h'),
                      'wb')
   GenerateMockBindingsHeader(header_file, GL_FUNCTIONS)
   header_file.close()
 
   source_file = open(os.path.join(directory, 'gl_bindings_autogen_mock.cc'),
                      'wb')
   GenerateMockBindingsSource(source_file, GL_FUNCTIONS)
   source_file.close()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))