fix --show-composited-layer-borders on Mac

gpu/command_buffer/build_gles2_cmd_buffer.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 GLES2 command buffers."""
 
 import itertools
 import os
 import os.path
@@ skipping 483 matching lines @@
         'default': '0',
         'es3': True,
         'manual': True,
       }
     ],
   },
   # TODO: Consider implemenenting these states
   # GL_ACTIVE_TEXTURE
   'LineWidth': {
     'type': 'Normal',
-    'func': 'LineWidth',
+    'custom_function_prefix' : 'Do',
+    'func': 'DoLineWidth',
     'enum': 'GL_LINE_WIDTH',
     'states': [
       {
         'name': 'line_width',
         'type': 'GLfloat',
         'default': '1.0f',
         'range_checks': [{'check': "<= 0.0f", 'test_value': "0.0f"}],
         'nan_check': True,
       }],
   },
@@ skipping 9751 matching lines @@
             for place, item in enumerate(state['states']):
               item_name = CachedStateName(item)
               args.append('%s' % item_name)
               if test_prev:
                 if place > 0:
                   f.write(' ||\n')
                 f.write("(%s != prev_state->%s)" %
                            (item_name, item_name))
             if test_prev:
               f.write("    )\n")
-            f.write("  gl%s(%s);\n" % (state['func'], ", ".join(args)))
+            if 'custom_function_prefix' in state:
+              f.write("  %s(%s);\n" % (state['func'], ", ".join(args)))
+            else:
+              f.write("  gl%s(%s);\n" % (state['func'], ", ".join(args)))
 
       f.write("  if (prev_state) {")
       WriteStates(True)
       f.write("  } else {")
       WriteStates(False)
       f.write("  }")
       f.write("  InitStateManual(prev_state);")
       f.write("}\n")
 
       f.write("""bool ContextState::GetEnabled(GLenum cap) const {
@@ skipping 235 matching lines @@
                        state['extension_flag'])
             f.write("  ")
           args = []
           for item in state['states']:
             if 'expected' in item:
               args.append(item['expected'])
             else:
               args.append(item['default'])
           # TODO: Currently we do not check array values.
           args = ["_" if isinstance(arg, list) else arg for arg in args]
+          func_name = state['func']
+          if 'custom_function_prefix' in state:
+            func_prefix = state['custom_function_prefix'];
+            if func_name.startswith(func_prefix):
+              func_name = func_name[len(func_prefix):]

[piman, 2016/11/09 16:32:13]

Mmh, the reason I suggested manual code for the test, is that a Do* function may
do much more than just calling the underlying gl function - e.g. calling several
gl functions, calling a different one, calling none, etc. So to set the
expectation automatically based on mangling the function name is a bit of a
stretch

[Lof, 2016/11/09 22:14:19]

Done.

           f.write("  EXPECT_CALL(*gl_, %s(%s))\n" %
-                     (state['func'], ", ".join(args)))
+                     (func_name, ", ".join(args)))
           f.write("      .Times(1)\n")
           f.write("      .RetiresOnSaturation();\n")
           if 'extension_flag' in state:
             f.write("  }\n")
       f.write("  SetupInitStateManualExpectations(es3_capable);\n")
       f.write("}\n")
     self.generated_cpp_filenames.append(filename)
 
   def WriteServiceUnitTestsForExtensions(self, filename):
     """Writes the service decorder unit tests for functions with extension_flag.
@@ skipping 631 matching lines @@
   Format(gen.generated_cpp_filenames)
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))