Log GLenums as strings in service

ui/gfx/gl/generate_bindings.py

 #!/usr/bin/env python
 # 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.
 
 """code generator for GL/GLES extension wrangler."""
 
 import os
 import collections
 import re
@@ skipping 59 matching lines @@
                'GLbitfield mask, GLenum filter', },
 { 'return_type': 'void',
   'names': ['glBufferData'],
   'arguments': 'GLenum target, GLsizei size, const void* data, GLenum usage', },
 { 'return_type': 'void',
   'names': ['glBufferSubData'],
   'arguments': 'GLenum target, GLint offset, GLsizei size, const void* data', },
 { 'return_type': 'GLenum',
   'names': ['glCheckFramebufferStatusEXT',
             'glCheckFramebufferStatus'],
-  'arguments': 'GLenum target', },
+  'arguments': 'GLenum target',
+  'logging_code': """
+  GL_SERVICE_LOG("GL_RESULT: " << GLES2Util::GetStringEnum(result));
+""", },
 { 'return_type': 'void',
   'names': ['glClear'],
   'arguments': 'GLbitfield mask', },
 { 'return_type': 'void',
   'names': ['glClearColor'],
   'arguments': 'GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha', },
 { 'return_type': 'void',
   'names': ['glClearDepth'],
   'arguments': 'GLclampd depth', },
 { 'return_type': 'void',
@@ skipping 161 matching lines @@
   'names': ['glGetAttribLocation'],
   'arguments': 'GLuint program, const char* name', },
 { 'return_type': 'void',
   'names': ['glGetBooleanv'],
   'arguments': 'GLenum pname, GLboolean* params', },
 { 'return_type': 'void',
   'names': ['glGetBufferParameteriv'],
   'arguments': 'GLenum target, GLenum pname, GLint* params', },
 { 'return_type': 'GLenum',
   'names': ['glGetError'],
-  'arguments': 'void', },
+  'arguments': 'void',
+  'logging_code': """
+  GL_SERVICE_LOG("GL_RESULT: " << GLES2Util::GetStringError(result));
+""", },
 { 'return_type': 'void',
   'names': ['glGetFloatv'],
   'arguments': 'GLenum pname, GLfloat* params', },
 { 'return_type': 'void',
   'names': ['glGetFramebufferAttachmentParameterivEXT',
             'glGetFramebufferAttachmentParameteriv'],
   'arguments': 'GLenum target, '
                'GLenum attachment, GLenum pname, GLint* params', },
 { 'return_type': 'GLenum',
   'names': ['glGetGraphicsResetStatusARB'],
@@ skipping 801 matching lines @@
   """Generates gl_binding_autogen_x.cc"""
 
   # Write file header.
   file.write('// Copyright (c) 2011 The Chromium Authors. All rights reserved.\n')
   file.write('// Use of this source code is governed by a BSD-style license that can be\n')
   file.write('// found in the LICENSE file.\n')
   file.write('\n')
   file.write('// This file is automatically generated.\n')
   file.write('\n')
   file.write('#include <string>\n')
+  file.write('#include "gpu/command_buffer/common/gles2_cmd_utils.h"\n')
   file.write('#include "ui/gfx/gl/gl_bindings.h"\n')
   file.write('#include "ui/gfx/gl/gl_context.h"\n')
   file.write('#include "ui/gfx/gl/gl_implementation.h"\n')
 
   # Write definitions for booleans indicating which extensions are available.
   file.write('\n')
+  file.write('using gpu::gles2::GLES2Util;\n')
+  file.write('\n')
   file.write('namespace gfx {\n')
   file.write('\n')
   for extension, ext_functions in used_extension_functions:
     file.write('bool g_%s;\n' % extension)
 
   # Write definitions of function pointers.
   file.write('\n')
   file.write('static bool g_debugBindingsInitialized;\n')
   file.write('static void UpdateDebugGLExtensionBindings();\n')
   file.write('\n')
@@ skipping 58 matching lines @@
     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(
+        r'(?<!E)GLenum ([a-zA-Z0-9_]+)', r'GLenum_\1', log_argument_names)
+    log_argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2',
         log_argument_names)
     log_argument_names = re.sub(
         r'(const )?[a-zA-Z0-9_]+\** ([a-zA-Z0-9_]+)', r'\2',
         log_argument_names)
     log_argument_names = re.sub(
         r'CONSTVOID_([a-zA-Z0-9_]+)',
         r'static_cast<const void*>(\1)', log_argument_names);
     log_argument_names = re.sub(
         r'CONSTCHAR_([a-zA-Z0-9_]+)', r'\1', log_argument_names);
-    log_argument_names = log_argument_names.replace(',', ' << ", " <<');
+    log_argument_names = re.sub(
+        r'GLenum_([a-zA-Z0-9_]+)', r'GLES2Util::GetStringEnum(\1)',
+        log_argument_names)
+    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 = names[0]
     if return_type == 'void':
       file.write('  GL_SERVICE_LOG("%s" << "(" %s << ")");\n' %
           (function_name, log_argument_names))
       file.write('  g_debug_%s(%s);\n' %
           (function_name, argument_names))
+      if 'logging_code' in func:
+        file.write("%s\n" % func['logging_code'])
     else:
       file.write('  GL_SERVICE_LOG("%s" << "(" %s << ")");\n' %
           (function_name, log_argument_names))
       file.write('  %s result = g_debug_%s(%s);\n' %
           (return_type, function_name, argument_names))
-      file.write('  GL_SERVICE_LOG("GL_RESULT: " << result);\n');
+      if 'logging_code' in func:
+        file.write("%s\n" % func['logging_code'])
+      else:
+        file.write('  GL_SERVICE_LOG("GL_RESULT: " << result);\n');
       file.write('  return result;\n')
-    if 'logging_code' in func:
-      file.write("%s\n" % func['logging_code'])
     file.write('}\n')
   file.write('}  // extern "C"\n')
 
   # Write function to initialize the debug function pointers.
   file.write('\n')
   file.write('void InitializeDebugGLBindings%s() {\n' % set_name.upper())
   for func in functions:
     first_name = func['names'][0]
     file.write('  if (!g_debug_%s) {\n' % first_name)
     file.write('    g_debug_%s = g_%s;\n' % (first_name, first_name))
@@ skipping 230 matching lines @@
     source_file.close()
 
   source_file = open(os.path.join(dir, 'gl_bindings_autogen_mock.cc'), 'wb')
   GenerateMockSource(source_file, GL_FUNCTIONS)
   source_file.close()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))