gpu: Change the hex code of conflicted _CHROMIUM macro

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 8280 matching lines @@
       if _NAMED_TYPE_INFO[type_info]['type'] == 'GLenum':
         file.Write("static std::string GetString%s(uint32_t value);\n" %
                    type_info)
     file.Write("\n")
     file.Close()
     self.generated_cpp_filenames.append(file.filename)
 
   def WriteCommonUtilsImpl(self, filename):
     """Writes the gles2 common utility header."""
     enum_re = re.compile(r'\#define\s+(GL_[a-zA-Z0-9_]+)\s+([0-9A-Fa-fx]+)')
+    chromium_re = re.compile(r'[a-zA-Z0-9_]+_CHROMIUM$')
     dict = {}
     for fname in ['third_party/khronos/GLES2/gl2.h',
                   'third_party/khronos/GLES2/gl2ext.h',
                   'gpu/GLES2/gl2chromium.h',
                   'gpu/GLES2/gl2extchromium.h']:
       lines = open(fname).readlines()
       for line in lines:
         m = enum_re.match(line)
         if m:
           name = m.group(1)
           value = m.group(2)
-          if len(value) <= 10 and not value in dict:
-            dict[value] = name
+          if len(value) <= 10:
+            if not value in dict:
+              dict[value] = name
+            # check our own _CHROMIUM macro conflicts with khronos GL headers.
+            elif dict[value] != name and (chromium_re.match(name)

[no sievers, 2014/11/18 19:57:20]

I think and takes precedence and you need to group dict[value] != name and (...
or ...).

also nit: probably good enough to say 'elif dict[value] != name and
(name.endswith('_CHROMIUM') or dict[value].endswith('_CHROMIUM'))' and remove
the second regexp

+                or chromium_re.match(dict[value])):
+              self.Error("code conflict %s and %s have the same code %s" %
+                         (dict[value], name, value))
 
     file = CHeaderWriter(filename)
     file.Write("static const GLES2Util::EnumToString "
                "enum_to_string_table[] = {\n")
     for value in dict:
       file.Write('  { %s, "%s", },\n' % (value, dict[value]))
     file.Write("""};
 
 const GLES2Util::EnumToString* const GLES2Util::enum_to_string_table_ =
     enum_to_string_table;
@@ skipping 363 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:]))