Revert of Updated Khronos GLES2 headers.

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 35 matching lines @@
   'GLshort': 'short',
   'GLint': 'int',
   'GLsizei': 'int',
   'GLubyte': 'unsigned char',
   'GLushort': 'unsigned short',
   'GLuint': 'unsigned int',
   'GLfloat': 'float',
   'GLclampf': 'float',
   'GLvoid': 'void',
   'GLfixed': 'int',
-  'GLclampx': 'int'
-}
-
-_GL_TYPES_32 = {
+  'GLclampx': 'int',
   'GLintptr': 'long int',
-  'GLsizeiptr': 'long int'
-}
-
-_GL_TYPES_64 = {
-  'GLintptr': 'long long int',
-  'GLsizeiptr': 'long long int'
+  'GLsizeiptr': 'long int',
 }
 
 # Capabilites selected with glEnable
 _CAPABILITY_FLAGS = [
   {'name': 'blend'},
   {'name': 'cull_face'},
   {'name': 'depth_test', 'state_flag': 'framebuffer_state_.clear_state_dirty'},
   {'name': 'dither', 'default': True},
   {'name': 'polygon_offset_fill'},
   {'name': 'sample_alpha_to_coverage'},
@@ skipping 7517 matching lines @@
         "// OpenGL ES interface.\n",
         2)
 
     file.Write("#include \"ppapi/c/pp_resource.h\"\n")
     if dev:
       file.Write("#include \"ppapi/c/ppb_opengles2.h\"\n\n")
     else:
       file.Write("\n#ifndef __gl2_h_\n")
       for (k, v) in _GL_TYPES.iteritems():
         file.Write("typedef %s %s;\n" % (v, k))
-      file.Write("#ifdef _WIN64\n")
-      for (k, v) in _GL_TYPES_64.iteritems():
-        file.Write("typedef %s %s;\n" % (v, k))
-      file.Write("#else\n")
-      for (k, v) in _GL_TYPES_32.iteritems():
-        file.Write("typedef %s %s;\n" % (v, k))
-      file.Write("#endif  // _WIN64\n")
       file.Write("#endif  // __gl2_h_\n\n")
 
     for interface in self.pepper_interfaces:
       if interface.dev != dev:
         continue
       file.Write("#define %s_1_0 \"%s;1.0\"\n" %
                  (interface.GetInterfaceName(), interface.GetInterfaceString()))
       file.Write("#define %s %s_1_0\n" %
                  (interface.GetInterfaceName(), interface.GetInterfaceName()))
 
@@ skipping 232 matching lines @@
     gen.WriteGLES2Header("../GLES2/gl2chromium_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))