Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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 1411 matching lines @@
   'SyncFlags': {
     'type': 'GLbitfield',
     'is_complete': True,
     'valid': [
       '0',
     ],
     'invalid': [
       '1',
     ],
   },
-  'SyncFlushFlags': {
-    'type': 'GLbitfield',
-    'is_complete': True,
-    'valid': [
-      'GL_SYNC_FLUSH_COMMANDS_BIT',
-      '0',
-    ],
-    'invalid': [
-      '0xFFFFFFFF',
-    ],
-  },
 }
 
 # This table specifies the different pepper interfaces that are supported for
 # GL commands. 'dev' is true if it's a dev interface.
 _PEPPER_INTERFACES = [
   {'name': '', 'dev': False},
   {'name': 'InstancedArrays', 'dev': False},
   {'name': 'FramebufferBlit', 'dev': False},
   {'name': 'FramebufferMultisample', 'dev': False},
   {'name': 'ChromiumEnableFeature', 'dev': False},
@@ skipping 193 matching lines @@
   },
   'ClearDepthf': {
     'type': 'StateSet',
     'state': 'ClearDepthf',
     'decoder_func': 'glClearDepth',
     'gl_test_func': 'glClearDepth',
     'valid_args': {
       '0': '0.5f'
     },
   },
-  'ClientWaitSync': {
-    'type': 'Custom',
-    'data_transfer_methods': ['shm'],
-    'cmd_args': 'GLuint sync, GLbitfieldSyncFlushFlags flags, '
-                'GLuint timeout_0, GLuint timeout_1, GLenum* result',
-    'unsafe': True,
-    'result': ['GLenum'],
-  },
   'ColorMask': {
     'type': 'StateSet',
     'state': 'ColorMask',
     'no_gl': True,
     'expectation': False,
   },
   'ConsumeTextureCHROMIUM': {
     'decoder_func': 'DoConsumeTextureCHROMIUM',
     'impl_func': False,
     'type': 'PUT',
@@ skipping 1247 matching lines @@
     'client_test': False,
     'unsafe': True,
   },
   'VertexAttribPointer': {
     'type': 'Manual',
     'cmd_args': 'GLuint indx, GLintVertexAttribSize size, '
                 'GLenumVertexAttribType type, GLboolean normalized, '
                 'GLsizei stride, GLuint offset',
     'client_test': False,
   },
-  'WaitSync': {
-    'type': 'Custom',
-    'cmd_args': 'GLuint sync, GLbitfieldSyncFlushFlags flags, '
-                'GLuint timeout_0, GLuint timeout_1',
-    'impl_func': False,
-    'client_test': False,
-    'unsafe': True,
-  },
   'Scissor': {
     'type': 'StateSet',
     'state': 'Scissor',
   },
   'Viewport': {
     'decoder_func': 'DoViewport',
   },
   'ResizeCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
@@ skipping 6042 matching lines @@
     file.Write("\n")
     file.Close()
     self.generated_cpp_filenames.append(file.filename)
 
   def WriteFormat(self, filename):
     """Writes the command buffer format"""
     file = CHeaderWriter(filename)
     # Forward declaration of a few enums used in constant argument
     # to avoid including GL header files.
     enum_defines = {
-        'GL_SYNC_GPU_COMMANDS_COMPLETE': '0x9117',
-        'GL_SYNC_FLUSH_COMMANDS_BIT': '0x00000001',
+        'GL_SYNC_GPU_COMMANDS_COMPLETE': 0x9117,
       }
     file.Write('\n')
     for enum in enum_defines:
-      file.Write("#define %s %s\n" % (enum, enum_defines[enum]))
+      file.Write("#define %s 0x%x\n" % (enum, enum_defines[enum]))
     file.Write('\n')
     for func in self.functions:
       if True:
       #gen_cmd = func.GetInfo('gen_cmd')
       #if gen_cmd == True or gen_cmd == None:
         func.WriteStruct(file)
     file.Write("\n")
     file.Close()
     self.generated_cpp_filenames.append(file.filename)
 
@@ skipping 1143 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:]))