Remove inappropriate code generation.

Code generation should not be used for for simple
things like repeating a few strings. It makes
code harder to edit and understand.

BUG=none
R=apatrick@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11747003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174895 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 280 insertions, 557 deletions

diff --git a/gpu/GLES2/gl2chromium.h b/gpu/GLES2/gl2chromium.h
index ff22141..3b42904 100644
--- a/gpu/GLES2/gl2chromium.h
+++ b/gpu/GLES2/gl2chromium.h
@@ -2,16 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto-generated from
-// gpu/command_buffer/build_gles2_cmd_buffer.py
-// DO NOT EDIT!
-
 // This file contains Chromium-specific GLES2 declarations.
 
 #ifndef GPU_GLES2_GL2CHROMIUM_H_
 #define GPU_GLES2_GL2CHROMIUM_H_
 
 #include <GLES2/gl2platform.h>
+
 #define GL_CONTEXT_LOST 0x300E
 
 // Because we are using both the real system GL and our own
@@ -22,216 +19,7 @@
 #define GLES2_GET_FUN(name) GLES2 ## name
 #endif
 
-#define glActiveTexture GLES2_GET_FUN(ActiveTexture)
-#define glAttachShader GLES2_GET_FUN(AttachShader)
-#define glBindAttribLocation GLES2_GET_FUN(BindAttribLocation)
-#define glBindBuffer GLES2_GET_FUN(BindBuffer)
-#define glBindFramebuffer GLES2_GET_FUN(BindFramebuffer)
-#define glBindRenderbuffer GLES2_GET_FUN(BindRenderbuffer)
-#define glBindTexture GLES2_GET_FUN(BindTexture)
-#define glBlendColor GLES2_GET_FUN(BlendColor)
-#define glBlendEquation GLES2_GET_FUN(BlendEquation)
-#define glBlendEquationSeparate GLES2_GET_FUN(BlendEquationSeparate)
-#define glBlendFunc GLES2_GET_FUN(BlendFunc)
-#define glBlendFuncSeparate GLES2_GET_FUN(BlendFuncSeparate)
-#define glBufferData GLES2_GET_FUN(BufferData)
-#define glBufferSubData GLES2_GET_FUN(BufferSubData)
-#define glCheckFramebufferStatus GLES2_GET_FUN(CheckFramebufferStatus)
-#define glClear GLES2_GET_FUN(Clear)
-#define glClearColor GLES2_GET_FUN(ClearColor)
-#define glClearDepthf GLES2_GET_FUN(ClearDepthf)
-#define glClearStencil GLES2_GET_FUN(ClearStencil)
-#define glColorMask GLES2_GET_FUN(ColorMask)
-#define glCompileShader GLES2_GET_FUN(CompileShader)
-#define glCompressedTexImage2D GLES2_GET_FUN(CompressedTexImage2D)
-#define glCompressedTexSubImage2D GLES2_GET_FUN(CompressedTexSubImage2D)
-#define glCopyTexImage2D GLES2_GET_FUN(CopyTexImage2D)
-#define glCopyTexSubImage2D GLES2_GET_FUN(CopyTexSubImage2D)
-#define glCreateProgram GLES2_GET_FUN(CreateProgram)
-#define glCreateShader GLES2_GET_FUN(CreateShader)
-#define glCullFace GLES2_GET_FUN(CullFace)
-#define glDeleteBuffers GLES2_GET_FUN(DeleteBuffers)
-#define glDeleteFramebuffers GLES2_GET_FUN(DeleteFramebuffers)
-#define glDeleteProgram GLES2_GET_FUN(DeleteProgram)
-#define glDeleteRenderbuffers GLES2_GET_FUN(DeleteRenderbuffers)
-#define glDeleteShader GLES2_GET_FUN(DeleteShader)
-#define glDeleteTextures GLES2_GET_FUN(DeleteTextures)
-#define glDepthFunc GLES2_GET_FUN(DepthFunc)
-#define glDepthMask GLES2_GET_FUN(DepthMask)
-#define glDepthRangef GLES2_GET_FUN(DepthRangef)
-#define glDetachShader GLES2_GET_FUN(DetachShader)
-#define glDisable GLES2_GET_FUN(Disable)
-#define glDisableVertexAttribArray GLES2_GET_FUN(DisableVertexAttribArray)
-#define glDrawArrays GLES2_GET_FUN(DrawArrays)
-#define glDrawElements GLES2_GET_FUN(DrawElements)
-#define glEnable GLES2_GET_FUN(Enable)
-#define glEnableVertexAttribArray GLES2_GET_FUN(EnableVertexAttribArray)
-#define glFinish GLES2_GET_FUN(Finish)
-#define glFlush GLES2_GET_FUN(Flush)
-#define glShallowFlushCHROMIUM GLES2_GET_FUN(ShallowFlushCHROMIUM)
-#define glFramebufferRenderbuffer GLES2_GET_FUN(FramebufferRenderbuffer)
-#define glFramebufferTexture2D GLES2_GET_FUN(FramebufferTexture2D)
-#define glFrontFace GLES2_GET_FUN(FrontFace)
-#define glGenBuffers GLES2_GET_FUN(GenBuffers)
-#define glGenerateMipmap GLES2_GET_FUN(GenerateMipmap)
-#define glGenFramebuffers GLES2_GET_FUN(GenFramebuffers)
-#define glGenRenderbuffers GLES2_GET_FUN(GenRenderbuffers)
-#define glGenTextures GLES2_GET_FUN(GenTextures)
-#define glGetActiveAttrib GLES2_GET_FUN(GetActiveAttrib)
-#define glGetActiveUniform GLES2_GET_FUN(GetActiveUniform)
-#define glGetAttachedShaders GLES2_GET_FUN(GetAttachedShaders)
-#define glGetAttribLocation GLES2_GET_FUN(GetAttribLocation)
-#define glGetBooleanv GLES2_GET_FUN(GetBooleanv)
-#define glGetBufferParameteriv GLES2_GET_FUN(GetBufferParameteriv)
-#define glGetError GLES2_GET_FUN(GetError)
-#define glGetFloatv GLES2_GET_FUN(GetFloatv)
-#define glGetFramebufferAttachmentParameteriv GLES2_GET_FUN( \
-    GetFramebufferAttachmentParameteriv)
-#define glGetIntegerv GLES2_GET_FUN(GetIntegerv)
-#define glGetProgramiv GLES2_GET_FUN(GetProgramiv)
-#define glGetProgramInfoLog GLES2_GET_FUN(GetProgramInfoLog)
-#define glGetRenderbufferParameteriv GLES2_GET_FUN(GetRenderbufferParameteriv)
-#define glGetShaderiv GLES2_GET_FUN(GetShaderiv)
-#define glGetShaderInfoLog GLES2_GET_FUN(GetShaderInfoLog)
-#define glGetShaderPrecisionFormat GLES2_GET_FUN(GetShaderPrecisionFormat)
-#define glGetShaderSource GLES2_GET_FUN(GetShaderSource)
-#define glGetString GLES2_GET_FUN(GetString)
-#define glGetTexParameterfv GLES2_GET_FUN(GetTexParameterfv)
-#define glGetTexParameteriv GLES2_GET_FUN(GetTexParameteriv)
-#define glGetUniformfv GLES2_GET_FUN(GetUniformfv)
-#define glGetUniformiv GLES2_GET_FUN(GetUniformiv)
-#define glGetUniformLocation GLES2_GET_FUN(GetUniformLocation)
-#define glGetVertexAttribfv GLES2_GET_FUN(GetVertexAttribfv)
-#define glGetVertexAttribiv GLES2_GET_FUN(GetVertexAttribiv)
-#define glGetVertexAttribPointerv GLES2_GET_FUN(GetVertexAttribPointerv)
-#define glHint GLES2_GET_FUN(Hint)
-#define glIsBuffer GLES2_GET_FUN(IsBuffer)
-#define glIsEnabled GLES2_GET_FUN(IsEnabled)
-#define glIsFramebuffer GLES2_GET_FUN(IsFramebuffer)
-#define glIsProgram GLES2_GET_FUN(IsProgram)
-#define glIsRenderbuffer GLES2_GET_FUN(IsRenderbuffer)
-#define glIsShader GLES2_GET_FUN(IsShader)
-#define glIsTexture GLES2_GET_FUN(IsTexture)
-#define glLineWidth GLES2_GET_FUN(LineWidth)
-#define glLinkProgram GLES2_GET_FUN(LinkProgram)
-#define glPixelStorei GLES2_GET_FUN(PixelStorei)
-#define glPolygonOffset GLES2_GET_FUN(PolygonOffset)
-#define glReadPixels GLES2_GET_FUN(ReadPixels)
-#define glReleaseShaderCompiler GLES2_GET_FUN(ReleaseShaderCompiler)
-#define glRenderbufferStorage GLES2_GET_FUN(RenderbufferStorage)
-#define glSampleCoverage GLES2_GET_FUN(SampleCoverage)
-#define glScissor GLES2_GET_FUN(Scissor)
-#define glShaderBinary GLES2_GET_FUN(ShaderBinary)
-#define glShaderSource GLES2_GET_FUN(ShaderSource)
-#define glStencilFunc GLES2_GET_FUN(StencilFunc)
-#define glStencilFuncSeparate GLES2_GET_FUN(StencilFuncSeparate)
-#define glStencilMask GLES2_GET_FUN(StencilMask)
-#define glStencilMaskSeparate GLES2_GET_FUN(StencilMaskSeparate)
-#define glStencilOp GLES2_GET_FUN(StencilOp)
-#define glStencilOpSeparate GLES2_GET_FUN(StencilOpSeparate)
-#define glTexImage2D GLES2_GET_FUN(TexImage2D)
-#define glTexParameterf GLES2_GET_FUN(TexParameterf)
-#define glTexParameterfv GLES2_GET_FUN(TexParameterfv)
-#define glTexParameteri GLES2_GET_FUN(TexParameteri)
-#define glTexParameteriv GLES2_GET_FUN(TexParameteriv)
-#define glTexSubImage2D GLES2_GET_FUN(TexSubImage2D)
-#define glUniform1f GLES2_GET_FUN(Uniform1f)
-#define glUniform1fv GLES2_GET_FUN(Uniform1fv)
-#define glUniform1i GLES2_GET_FUN(Uniform1i)
-#define glUniform1iv GLES2_GET_FUN(Uniform1iv)
-#define glUniform2f GLES2_GET_FUN(Uniform2f)
-#define glUniform2fv GLES2_GET_FUN(Uniform2fv)
-#define glUniform2i GLES2_GET_FUN(Uniform2i)
-#define glUniform2iv GLES2_GET_FUN(Uniform2iv)
-#define glUniform3f GLES2_GET_FUN(Uniform3f)
-#define glUniform3fv GLES2_GET_FUN(Uniform3fv)
-#define glUniform3i GLES2_GET_FUN(Uniform3i)
-#define glUniform3iv GLES2_GET_FUN(Uniform3iv)
-#define glUniform4f GLES2_GET_FUN(Uniform4f)
-#define glUniform4fv GLES2_GET_FUN(Uniform4fv)
-#define glUniform4i GLES2_GET_FUN(Uniform4i)
-#define glUniform4iv GLES2_GET_FUN(Uniform4iv)
-#define glUniformMatrix2fv GLES2_GET_FUN(UniformMatrix2fv)
-#define glUniformMatrix3fv GLES2_GET_FUN(UniformMatrix3fv)
-#define glUniformMatrix4fv GLES2_GET_FUN(UniformMatrix4fv)
-#define glUseProgram GLES2_GET_FUN(UseProgram)
-#define glValidateProgram GLES2_GET_FUN(ValidateProgram)
-#define glVertexAttrib1f GLES2_GET_FUN(VertexAttrib1f)
-#define glVertexAttrib1fv GLES2_GET_FUN(VertexAttrib1fv)
-#define glVertexAttrib2f GLES2_GET_FUN(VertexAttrib2f)
-#define glVertexAttrib2fv GLES2_GET_FUN(VertexAttrib2fv)
-#define glVertexAttrib3f GLES2_GET_FUN(VertexAttrib3f)
-#define glVertexAttrib3fv GLES2_GET_FUN(VertexAttrib3fv)
-#define glVertexAttrib4f GLES2_GET_FUN(VertexAttrib4f)
-#define glVertexAttrib4fv GLES2_GET_FUN(VertexAttrib4fv)
-#define glVertexAttribPointer GLES2_GET_FUN(VertexAttribPointer)
-#define glViewport GLES2_GET_FUN(Viewport)
-#define glBlitFramebufferEXT GLES2_GET_FUN(BlitFramebufferEXT)
-#define glRenderbufferStorageMultisampleEXT GLES2_GET_FUN( \
-    RenderbufferStorageMultisampleEXT)
-#define glTexStorage2DEXT GLES2_GET_FUN(TexStorage2DEXT)
-#define glGenQueriesEXT GLES2_GET_FUN(GenQueriesEXT)
-#define glDeleteQueriesEXT GLES2_GET_FUN(DeleteQueriesEXT)
-#define glIsQueryEXT GLES2_GET_FUN(IsQueryEXT)
-#define glBeginQueryEXT GLES2_GET_FUN(BeginQueryEXT)
-#define glEndQueryEXT GLES2_GET_FUN(EndQueryEXT)
-#define glGetQueryivEXT GLES2_GET_FUN(GetQueryivEXT)
-#define glGetQueryObjectuivEXT GLES2_GET_FUN(GetQueryObjectuivEXT)
-#define glInsertEventMarkerEXT GLES2_GET_FUN(InsertEventMarkerEXT)
-#define glPushGroupMarkerEXT GLES2_GET_FUN(PushGroupMarkerEXT)
-#define glPopGroupMarkerEXT GLES2_GET_FUN(PopGroupMarkerEXT)
-#define glGenVertexArraysOES GLES2_GET_FUN(GenVertexArraysOES)
-#define glDeleteVertexArraysOES GLES2_GET_FUN(DeleteVertexArraysOES)
-#define glIsVertexArrayOES GLES2_GET_FUN(IsVertexArrayOES)
-#define glBindVertexArrayOES GLES2_GET_FUN(BindVertexArrayOES)
-#define glSwapBuffers GLES2_GET_FUN(SwapBuffers)
-#define glGetMaxValueInBufferCHROMIUM GLES2_GET_FUN( \
-    GetMaxValueInBufferCHROMIUM)
-#define glGenSharedIdsCHROMIUM GLES2_GET_FUN(GenSharedIdsCHROMIUM)
-#define glDeleteSharedIdsCHROMIUM GLES2_GET_FUN(DeleteSharedIdsCHROMIUM)
-#define glRegisterSharedIdsCHROMIUM GLES2_GET_FUN(RegisterSharedIdsCHROMIUM)
-#define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM)
-#define glMapBufferCHROMIUM GLES2_GET_FUN(MapBufferCHROMIUM)
-#define glUnmapBufferCHROMIUM GLES2_GET_FUN(UnmapBufferCHROMIUM)
-#define glMapBufferSubDataCHROMIUM GLES2_GET_FUN(MapBufferSubDataCHROMIUM)
-#define glUnmapBufferSubDataCHROMIUM GLES2_GET_FUN(UnmapBufferSubDataCHROMIUM)
-#define glMapTexSubImage2DCHROMIUM GLES2_GET_FUN(MapTexSubImage2DCHROMIUM)
-#define glUnmapTexSubImage2DCHROMIUM GLES2_GET_FUN(UnmapTexSubImage2DCHROMIUM)
-#define glResizeCHROMIUM GLES2_GET_FUN(ResizeCHROMIUM)
-#define glGetRequestableExtensionsCHROMIUM GLES2_GET_FUN( \
-    GetRequestableExtensionsCHROMIUM)
-#define glRequestExtensionCHROMIUM GLES2_GET_FUN(RequestExtensionCHROMIUM)
-#define glRateLimitOffscreenContextCHROMIUM GLES2_GET_FUN( \
-    RateLimitOffscreenContextCHROMIUM)
-#define glGetMultipleIntegervCHROMIUM GLES2_GET_FUN( \
-    GetMultipleIntegervCHROMIUM)
-#define glGetProgramInfoCHROMIUM GLES2_GET_FUN(GetProgramInfoCHROMIUM)
-#define glCreateStreamTextureCHROMIUM GLES2_GET_FUN( \
-    CreateStreamTextureCHROMIUM)
-#define glDestroyStreamTextureCHROMIUM GLES2_GET_FUN( \
-    DestroyStreamTextureCHROMIUM)
-#define glGetTranslatedShaderSourceANGLE GLES2_GET_FUN( \
-    GetTranslatedShaderSourceANGLE)
-#define glPostSubBufferCHROMIUM GLES2_GET_FUN(PostSubBufferCHROMIUM)
-#define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN( \
-    TexImageIOSurface2DCHROMIUM)
-#define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)
-#define glDrawArraysInstancedANGLE GLES2_GET_FUN(DrawArraysInstancedANGLE)
-#define glDrawElementsInstancedANGLE GLES2_GET_FUN(DrawElementsInstancedANGLE)
-#define glVertexAttribDivisorANGLE GLES2_GET_FUN(VertexAttribDivisorANGLE)
-#define glGenMailboxCHROMIUM GLES2_GET_FUN(GenMailboxCHROMIUM)
-#define glProduceTextureCHROMIUM GLES2_GET_FUN(ProduceTextureCHROMIUM)
-#define glConsumeTextureCHROMIUM GLES2_GET_FUN(ConsumeTextureCHROMIUM)
-#define glBindUniformLocationCHROMIUM GLES2_GET_FUN( \
-    BindUniformLocationCHROMIUM)
-#define glBindTexImage2DCHROMIUM GLES2_GET_FUN(BindTexImage2DCHROMIUM)
-#define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM)
-#define glTraceBeginCHROMIUM GLES2_GET_FUN(TraceBeginCHROMIUM)
-#define glTraceEndCHROMIUM GLES2_GET_FUN(TraceEndCHROMIUM)
-#define glAsyncTexSubImage2DCHROMIUM GLES2_GET_FUN(AsyncTexSubImage2DCHROMIUM)
-#define glAsyncTexImage2DCHROMIUM GLES2_GET_FUN(AsyncTexImage2DCHROMIUM)
-#define glDiscardFramebufferEXT GLES2_GET_FUN(DiscardFramebufferEXT)
-#define glLoseContextCHROMIUM GLES2_GET_FUN(LoseContextCHROMIUM)
+#include <GLES2/gl2chromium_autogen.h>
 
 #endif  // GPU_GLES2_GL2CHROMIUM_H_
 
diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h
new file mode 100644
index 0000000..88bf547
--- /dev/null
+++ b/gpu/GLES2/gl2chromium_autogen.h
@@ -0,0 +1,226 @@
+// 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.
+
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// DO NOT EDIT!
+
+// This file contains Chromium-specific GLES2 declarations.
+
+#ifndef GPU_GLES2_GL2CHROMIUM_AUTOGEN_H_
+#define GPU_GLES2_GL2CHROMIUM_AUTOGEN_H_
+
+#define glActiveTexture GLES2_GET_FUN(ActiveTexture)
+#define glAttachShader GLES2_GET_FUN(AttachShader)
+#define glBindAttribLocation GLES2_GET_FUN(BindAttribLocation)
+#define glBindBuffer GLES2_GET_FUN(BindBuffer)
+#define glBindFramebuffer GLES2_GET_FUN(BindFramebuffer)
+#define glBindRenderbuffer GLES2_GET_FUN(BindRenderbuffer)
+#define glBindTexture GLES2_GET_FUN(BindTexture)
+#define glBlendColor GLES2_GET_FUN(BlendColor)
+#define glBlendEquation GLES2_GET_FUN(BlendEquation)
+#define glBlendEquationSeparate GLES2_GET_FUN(BlendEquationSeparate)
+#define glBlendFunc GLES2_GET_FUN(BlendFunc)
+#define glBlendFuncSeparate GLES2_GET_FUN(BlendFuncSeparate)
+#define glBufferData GLES2_GET_FUN(BufferData)
+#define glBufferSubData GLES2_GET_FUN(BufferSubData)
+#define glCheckFramebufferStatus GLES2_GET_FUN(CheckFramebufferStatus)
+#define glClear GLES2_GET_FUN(Clear)
+#define glClearColor GLES2_GET_FUN(ClearColor)
+#define glClearDepthf GLES2_GET_FUN(ClearDepthf)
+#define glClearStencil GLES2_GET_FUN(ClearStencil)
+#define glColorMask GLES2_GET_FUN(ColorMask)
+#define glCompileShader GLES2_GET_FUN(CompileShader)
+#define glCompressedTexImage2D GLES2_GET_FUN(CompressedTexImage2D)
+#define glCompressedTexSubImage2D GLES2_GET_FUN(CompressedTexSubImage2D)
+#define glCopyTexImage2D GLES2_GET_FUN(CopyTexImage2D)
+#define glCopyTexSubImage2D GLES2_GET_FUN(CopyTexSubImage2D)
+#define glCreateProgram GLES2_GET_FUN(CreateProgram)
+#define glCreateShader GLES2_GET_FUN(CreateShader)
+#define glCullFace GLES2_GET_FUN(CullFace)
+#define glDeleteBuffers GLES2_GET_FUN(DeleteBuffers)
+#define glDeleteFramebuffers GLES2_GET_FUN(DeleteFramebuffers)
+#define glDeleteProgram GLES2_GET_FUN(DeleteProgram)
+#define glDeleteRenderbuffers GLES2_GET_FUN(DeleteRenderbuffers)
+#define glDeleteShader GLES2_GET_FUN(DeleteShader)
+#define glDeleteTextures GLES2_GET_FUN(DeleteTextures)
+#define glDepthFunc GLES2_GET_FUN(DepthFunc)
+#define glDepthMask GLES2_GET_FUN(DepthMask)
+#define glDepthRangef GLES2_GET_FUN(DepthRangef)
+#define glDetachShader GLES2_GET_FUN(DetachShader)
+#define glDisable GLES2_GET_FUN(Disable)
+#define glDisableVertexAttribArray GLES2_GET_FUN(DisableVertexAttribArray)
+#define glDrawArrays GLES2_GET_FUN(DrawArrays)
+#define glDrawElements GLES2_GET_FUN(DrawElements)
+#define glEnable GLES2_GET_FUN(Enable)
+#define glEnableVertexAttribArray GLES2_GET_FUN(EnableVertexAttribArray)
+#define glFinish GLES2_GET_FUN(Finish)
+#define glFlush GLES2_GET_FUN(Flush)
+#define glShallowFlushCHROMIUM GLES2_GET_FUN(ShallowFlushCHROMIUM)
+#define glFramebufferRenderbuffer GLES2_GET_FUN(FramebufferRenderbuffer)
+#define glFramebufferTexture2D GLES2_GET_FUN(FramebufferTexture2D)
+#define glFrontFace GLES2_GET_FUN(FrontFace)
+#define glGenBuffers GLES2_GET_FUN(GenBuffers)
+#define glGenerateMipmap GLES2_GET_FUN(GenerateMipmap)
+#define glGenFramebuffers GLES2_GET_FUN(GenFramebuffers)
+#define glGenRenderbuffers GLES2_GET_FUN(GenRenderbuffers)
+#define glGenTextures GLES2_GET_FUN(GenTextures)
+#define glGetActiveAttrib GLES2_GET_FUN(GetActiveAttrib)
+#define glGetActiveUniform GLES2_GET_FUN(GetActiveUniform)
+#define glGetAttachedShaders GLES2_GET_FUN(GetAttachedShaders)
+#define glGetAttribLocation GLES2_GET_FUN(GetAttribLocation)
+#define glGetBooleanv GLES2_GET_FUN(GetBooleanv)
+#define glGetBufferParameteriv GLES2_GET_FUN(GetBufferParameteriv)
+#define glGetError GLES2_GET_FUN(GetError)
+#define glGetFloatv GLES2_GET_FUN(GetFloatv)
+#define glGetFramebufferAttachmentParameteriv GLES2_GET_FUN( \
+    GetFramebufferAttachmentParameteriv)
+#define glGetIntegerv GLES2_GET_FUN(GetIntegerv)
+#define glGetProgramiv GLES2_GET_FUN(GetProgramiv)
+#define glGetProgramInfoLog GLES2_GET_FUN(GetProgramInfoLog)
+#define glGetRenderbufferParameteriv GLES2_GET_FUN(GetRenderbufferParameteriv)
+#define glGetShaderiv GLES2_GET_FUN(GetShaderiv)
+#define glGetShaderInfoLog GLES2_GET_FUN(GetShaderInfoLog)
+#define glGetShaderPrecisionFormat GLES2_GET_FUN(GetShaderPrecisionFormat)
+#define glGetShaderSource GLES2_GET_FUN(GetShaderSource)
+#define glGetString GLES2_GET_FUN(GetString)
+#define glGetTexParameterfv GLES2_GET_FUN(GetTexParameterfv)
+#define glGetTexParameteriv GLES2_GET_FUN(GetTexParameteriv)
+#define glGetUniformfv GLES2_GET_FUN(GetUniformfv)
+#define glGetUniformiv GLES2_GET_FUN(GetUniformiv)
+#define glGetUniformLocation GLES2_GET_FUN(GetUniformLocation)
+#define glGetVertexAttribfv GLES2_GET_FUN(GetVertexAttribfv)
+#define glGetVertexAttribiv GLES2_GET_FUN(GetVertexAttribiv)
+#define glGetVertexAttribPointerv GLES2_GET_FUN(GetVertexAttribPointerv)
+#define glHint GLES2_GET_FUN(Hint)
+#define glIsBuffer GLES2_GET_FUN(IsBuffer)
+#define glIsEnabled GLES2_GET_FUN(IsEnabled)
+#define glIsFramebuffer GLES2_GET_FUN(IsFramebuffer)
+#define glIsProgram GLES2_GET_FUN(IsProgram)
+#define glIsRenderbuffer GLES2_GET_FUN(IsRenderbuffer)
+#define glIsShader GLES2_GET_FUN(IsShader)
+#define glIsTexture GLES2_GET_FUN(IsTexture)
+#define glLineWidth GLES2_GET_FUN(LineWidth)
+#define glLinkProgram GLES2_GET_FUN(LinkProgram)
+#define glPixelStorei GLES2_GET_FUN(PixelStorei)
+#define glPolygonOffset GLES2_GET_FUN(PolygonOffset)
+#define glReadPixels GLES2_GET_FUN(ReadPixels)
+#define glReleaseShaderCompiler GLES2_GET_FUN(ReleaseShaderCompiler)
+#define glRenderbufferStorage GLES2_GET_FUN(RenderbufferStorage)
+#define glSampleCoverage GLES2_GET_FUN(SampleCoverage)
+#define glScissor GLES2_GET_FUN(Scissor)
+#define glShaderBinary GLES2_GET_FUN(ShaderBinary)
+#define glShaderSource GLES2_GET_FUN(ShaderSource)
+#define glStencilFunc GLES2_GET_FUN(StencilFunc)
+#define glStencilFuncSeparate GLES2_GET_FUN(StencilFuncSeparate)
+#define glStencilMask GLES2_GET_FUN(StencilMask)
+#define glStencilMaskSeparate GLES2_GET_FUN(StencilMaskSeparate)
+#define glStencilOp GLES2_GET_FUN(StencilOp)
+#define glStencilOpSeparate GLES2_GET_FUN(StencilOpSeparate)
+#define glTexImage2D GLES2_GET_FUN(TexImage2D)
+#define glTexParameterf GLES2_GET_FUN(TexParameterf)
+#define glTexParameterfv GLES2_GET_FUN(TexParameterfv)
+#define glTexParameteri GLES2_GET_FUN(TexParameteri)
+#define glTexParameteriv GLES2_GET_FUN(TexParameteriv)
+#define glTexSubImage2D GLES2_GET_FUN(TexSubImage2D)
+#define glUniform1f GLES2_GET_FUN(Uniform1f)
+#define glUniform1fv GLES2_GET_FUN(Uniform1fv)
+#define glUniform1i GLES2_GET_FUN(Uniform1i)
+#define glUniform1iv GLES2_GET_FUN(Uniform1iv)
+#define glUniform2f GLES2_GET_FUN(Uniform2f)
+#define glUniform2fv GLES2_GET_FUN(Uniform2fv)
+#define glUniform2i GLES2_GET_FUN(Uniform2i)
+#define glUniform2iv GLES2_GET_FUN(Uniform2iv)
+#define glUniform3f GLES2_GET_FUN(Uniform3f)
+#define glUniform3fv GLES2_GET_FUN(Uniform3fv)
+#define glUniform3i GLES2_GET_FUN(Uniform3i)
+#define glUniform3iv GLES2_GET_FUN(Uniform3iv)
+#define glUniform4f GLES2_GET_FUN(Uniform4f)
+#define glUniform4fv GLES2_GET_FUN(Uniform4fv)
+#define glUniform4i GLES2_GET_FUN(Uniform4i)
+#define glUniform4iv GLES2_GET_FUN(Uniform4iv)
+#define glUniformMatrix2fv GLES2_GET_FUN(UniformMatrix2fv)
+#define glUniformMatrix3fv GLES2_GET_FUN(UniformMatrix3fv)
+#define glUniformMatrix4fv GLES2_GET_FUN(UniformMatrix4fv)
+#define glUseProgram GLES2_GET_FUN(UseProgram)
+#define glValidateProgram GLES2_GET_FUN(ValidateProgram)
+#define glVertexAttrib1f GLES2_GET_FUN(VertexAttrib1f)
+#define glVertexAttrib1fv GLES2_GET_FUN(VertexAttrib1fv)
+#define glVertexAttrib2f GLES2_GET_FUN(VertexAttrib2f)
+#define glVertexAttrib2fv GLES2_GET_FUN(VertexAttrib2fv)
+#define glVertexAttrib3f GLES2_GET_FUN(VertexAttrib3f)
+#define glVertexAttrib3fv GLES2_GET_FUN(VertexAttrib3fv)
+#define glVertexAttrib4f GLES2_GET_FUN(VertexAttrib4f)
+#define glVertexAttrib4fv GLES2_GET_FUN(VertexAttrib4fv)
+#define glVertexAttribPointer GLES2_GET_FUN(VertexAttribPointer)
+#define glViewport GLES2_GET_FUN(Viewport)
+#define glBlitFramebufferEXT GLES2_GET_FUN(BlitFramebufferEXT)
+#define glRenderbufferStorageMultisampleEXT GLES2_GET_FUN( \
+    RenderbufferStorageMultisampleEXT)
+#define glTexStorage2DEXT GLES2_GET_FUN(TexStorage2DEXT)
+#define glGenQueriesEXT GLES2_GET_FUN(GenQueriesEXT)
+#define glDeleteQueriesEXT GLES2_GET_FUN(DeleteQueriesEXT)
+#define glIsQueryEXT GLES2_GET_FUN(IsQueryEXT)
+#define glBeginQueryEXT GLES2_GET_FUN(BeginQueryEXT)
+#define glEndQueryEXT GLES2_GET_FUN(EndQueryEXT)
+#define glGetQueryivEXT GLES2_GET_FUN(GetQueryivEXT)
+#define glGetQueryObjectuivEXT GLES2_GET_FUN(GetQueryObjectuivEXT)
+#define glInsertEventMarkerEXT GLES2_GET_FUN(InsertEventMarkerEXT)
+#define glPushGroupMarkerEXT GLES2_GET_FUN(PushGroupMarkerEXT)
+#define glPopGroupMarkerEXT GLES2_GET_FUN(PopGroupMarkerEXT)
+#define glGenVertexArraysOES GLES2_GET_FUN(GenVertexArraysOES)
+#define glDeleteVertexArraysOES GLES2_GET_FUN(DeleteVertexArraysOES)
+#define glIsVertexArrayOES GLES2_GET_FUN(IsVertexArrayOES)
+#define glBindVertexArrayOES GLES2_GET_FUN(BindVertexArrayOES)
+#define glSwapBuffers GLES2_GET_FUN(SwapBuffers)
+#define glGetMaxValueInBufferCHROMIUM GLES2_GET_FUN( \
+    GetMaxValueInBufferCHROMIUM)
+#define glGenSharedIdsCHROMIUM GLES2_GET_FUN(GenSharedIdsCHROMIUM)
+#define glDeleteSharedIdsCHROMIUM GLES2_GET_FUN(DeleteSharedIdsCHROMIUM)
+#define glRegisterSharedIdsCHROMIUM GLES2_GET_FUN(RegisterSharedIdsCHROMIUM)
+#define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM)
+#define glMapBufferCHROMIUM GLES2_GET_FUN(MapBufferCHROMIUM)
+#define glUnmapBufferCHROMIUM GLES2_GET_FUN(UnmapBufferCHROMIUM)
+#define glMapBufferSubDataCHROMIUM GLES2_GET_FUN(MapBufferSubDataCHROMIUM)
+#define glUnmapBufferSubDataCHROMIUM GLES2_GET_FUN(UnmapBufferSubDataCHROMIUM)
+#define glMapTexSubImage2DCHROMIUM GLES2_GET_FUN(MapTexSubImage2DCHROMIUM)
+#define glUnmapTexSubImage2DCHROMIUM GLES2_GET_FUN(UnmapTexSubImage2DCHROMIUM)
+#define glResizeCHROMIUM GLES2_GET_FUN(ResizeCHROMIUM)
+#define glGetRequestableExtensionsCHROMIUM GLES2_GET_FUN( \
+    GetRequestableExtensionsCHROMIUM)
+#define glRequestExtensionCHROMIUM GLES2_GET_FUN(RequestExtensionCHROMIUM)
+#define glRateLimitOffscreenContextCHROMIUM GLES2_GET_FUN( \
+    RateLimitOffscreenContextCHROMIUM)
+#define glGetMultipleIntegervCHROMIUM GLES2_GET_FUN( \
+    GetMultipleIntegervCHROMIUM)
+#define glGetProgramInfoCHROMIUM GLES2_GET_FUN(GetProgramInfoCHROMIUM)
+#define glCreateStreamTextureCHROMIUM GLES2_GET_FUN( \
+    CreateStreamTextureCHROMIUM)
+#define glDestroyStreamTextureCHROMIUM GLES2_GET_FUN( \
+    DestroyStreamTextureCHROMIUM)
+#define glGetTranslatedShaderSourceANGLE GLES2_GET_FUN( \
+    GetTranslatedShaderSourceANGLE)
+#define glPostSubBufferCHROMIUM GLES2_GET_FUN(PostSubBufferCHROMIUM)
+#define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN( \
+    TexImageIOSurface2DCHROMIUM)
+#define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM)
+#define glDrawArraysInstancedANGLE GLES2_GET_FUN(DrawArraysInstancedANGLE)
+#define glDrawElementsInstancedANGLE GLES2_GET_FUN(DrawElementsInstancedANGLE)
+#define glVertexAttribDivisorANGLE GLES2_GET_FUN(VertexAttribDivisorANGLE)
+#define glGenMailboxCHROMIUM GLES2_GET_FUN(GenMailboxCHROMIUM)
+#define glProduceTextureCHROMIUM GLES2_GET_FUN(ProduceTextureCHROMIUM)
+#define glConsumeTextureCHROMIUM GLES2_GET_FUN(ConsumeTextureCHROMIUM)
+#define glBindUniformLocationCHROMIUM GLES2_GET_FUN( \
+    BindUniformLocationCHROMIUM)
+#define glBindTexImage2DCHROMIUM GLES2_GET_FUN(BindTexImage2DCHROMIUM)
+#define glReleaseTexImage2DCHROMIUM GLES2_GET_FUN(ReleaseTexImage2DCHROMIUM)
+#define glTraceBeginCHROMIUM GLES2_GET_FUN(TraceBeginCHROMIUM)
+#define glTraceEndCHROMIUM GLES2_GET_FUN(TraceEndCHROMIUM)
+#define glAsyncTexSubImage2DCHROMIUM GLES2_GET_FUN(AsyncTexSubImage2DCHROMIUM)
+#define glAsyncTexImage2DCHROMIUM GLES2_GET_FUN(AsyncTexImage2DCHROMIUM)
+#define glDiscardFramebufferEXT GLES2_GET_FUN(DiscardFramebufferEXT)
+#define glLoseContextCHROMIUM GLES2_GET_FUN(LoseContextCHROMIUM)
+
+#endif  // GPU_GLES2_GL2CHROMIUM_AUTOGEN_H_
+
diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h
index 0175740..8e5d9fa 100644
--- a/gpu/GLES2/gl2extchromium.h
+++ b/gpu/GLES2/gl2extchromium.h
@@ -2,16 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto-generated from
-// gpu/command_buffer/build_gles2_cmd_buffer.py
-// DO NOT EDIT!
-
 // This file contains Chromium-specific GLES2 extensions declarations.
 
 #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_
 #define GPU_GLES2_GL2EXTCHROMIUM_H_
 
 #include <GLES2/gl2chromium.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -24,10 +21,9 @@ GL_APICALL void GL_APIENTRY glTexImageIOSurface2DCHROMIUM(
     GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId,
     GLuint plane);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUMPROC) (
-        GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId,
-        GLuint plane);
+typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUMPROC) (
+    GLenum target, GLsizei width, GLsizei height, GLuint ioSurfaceId,
+    GLuint plane);
 #endif  /* GL_CHROMIUM_iosurface */
 
 /* GL_CHROMIUM_gpu_memory_manager */
@@ -56,22 +52,16 @@ typedef void (
 #endif
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glGenMailboxCHROMIUM(GLbyte* mailbox);
-#endif
-typedef void (GL_APIENTRYP PFNGLGENMAILBOXCHROMIUMPROC) (GLbyte* mailbox);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glProduceTextureCHROMIUM(
     GLenum target, const GLbyte* mailbox);
-#endif
-typedef void (
-    GL_APIENTRYP PFNGLPRODUCETEXTURECHROMIUMPROC) (
-        GLenum target, const GLbyte* mailbox);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glConsumeTextureCHROMIUM(
     GLenum target, const GLbyte* mailbox);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUMPROC) (
-        GLenum target, const GLbyte* mailbox);
+typedef void (GL_APIENTRYP PFNGLGENMAILBOXCHROMIUMPROC) (GLbyte* mailbox);
+typedef void (GL_APIENTRYP PFNGLPRODUCETEXTURECHROMIUMPROC) (
+    GLenum target, const GLbyte* mailbox);
+typedef void (GL_APIENTRYP PFNGLCONSUMETEXTURECHROMIUMPROC) (
+    GLenum target, const GLbyte* mailbox);
 #endif  /* GL_CHROMIUM_texture_mailbox */
 
 /* GL_CHROMIUM_pixel_transfer_buffer_object */
@@ -79,10 +69,12 @@ typedef void (
 #define GL_CHROMIUM_pixel_transfer_buffer_object 1
 
 #ifndef GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM
+// TODO(reveman): Get official numbers for this constants.
 #define GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM 0x88EC
 #endif
 
 #ifndef GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM
+// TODO(reveman): Get official numbers for this constants.
 #define GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM 0x88EF
 #endif
 #endif  /* GL_CHROMIUM_pixel_transfer_buffer_object */
@@ -101,27 +93,19 @@ typedef void (
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void* GL_APIENTRY glMapBufferSubDataCHROMIUM(
     GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-#endif
-typedef void* (
-    GL_APIENTRYP PFNGLMAPBUFFERSUBDATACHROMIUMPROC) (
-        GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glUnmapBufferSubDataCHROMIUM(const void* mem);
-#endif
-typedef void (
-    GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATACHROMIUMPROC) (const void* mem);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void* GL_APIENTRY glMapTexSubImage2DCHROMIUM(
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
     GLsizei height, GLenum format, GLenum type, GLenum access);
-#endif
-typedef void* (
-    GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUMPROC) (
-        GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-        GLsizei height, GLenum format, GLenum type, GLenum access);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM(const void* mem);
 #endif
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFERSUBDATACHROMIUMPROC) (
+    GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
+typedef void (
+    GL_APIENTRYP PFNGLUNMAPBUFFERSUBDATACHROMIUMPROC) (const void* mem);
+typedef void* (GL_APIENTRYP PFNGLMAPTEXSUBIMAGE2DCHROMIUMPROC) (
+    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    GLsizei height, GLenum format, GLenum type, GLenum access);
 typedef void (
     GL_APIENTRYP PFNGLUNMAPTEXSUBIMAGE2DCHROMIUMPROC) (const void* mem);
 #endif  /* GL_CHROMIUM_map_sub */
@@ -131,14 +115,12 @@ typedef void (
 #define GL_CHROMIUM_request_extension 1
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL const GLchar* GL_APIENTRY glGetRequestableExtensionsCHROMIUM();
-#endif
-typedef const GLchar* (
-    GL_APIENTRYP PFNGLGETREQUESTABLEEXTENSIONSCHROMIUMPROC) ();
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glRequestExtensionCHROMIUM(const char* extension);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLREQUESTEXTENSIONCHROMIUMPROC) (const char* extension);
+typedef const GLchar* (GL_APIENTRYP PFNGLGETREQUESTABLEEXTENSIONSCHROMIUMPROC) (
+    );
+typedef void (GL_APIENTRYP PFNGLREQUESTEXTENSIONCHROMIUMPROC) (
+    const char* extension);
 #endif  /* GL_CHROMIUM_request_extension */
 
 /* GL_CHROMIUM_get_error_query */
@@ -146,6 +128,7 @@ typedef void (
 #define GL_CHROMIUM_get_error_query 1
 
 #ifndef GL_GET_ERROR_QUERY_CHROMIUM
+// TODO(gman): Get official numbers for this constants.
 #define GL_GET_ERROR_QUERY_CHROMIUM 0x84F3
 #endif
 #endif  /* GL_CHROMIUM_get_error_query */
@@ -156,17 +139,13 @@ typedef void (
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glBindTexImage2DCHROMIUM(
     GLenum target, GLint imageId);
-#endif
-typedef void (
-    GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUMPROC) (
-        GLenum target, GLint imageId);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glReleaseTexImage2DCHROMIUM(
     GLenum target, GLint imageId);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC) (
-        GLenum target, GLint imageId);
+typedef void (GL_APIENTRYP PFNGLBINDTEXIMAGE2DCHROMIUMPROC) (
+    GLenum target, GLint imageId);
+typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC) (
+    GLenum target, GLint imageId);
 #endif  /* GL_CHROMIUM_texture_from_image */
 
 /* GL_CHROMIUM_rate_limit_offscreen_context */
@@ -185,9 +164,8 @@ typedef void (GL_APIENTRYP PFNGLRATELIMITOFFSCREENCONTEXTCHROMIUMPROC) ();
 GL_APICALL void GL_APIENTRY glPostSubBufferCHROMIUM(
     GLint x, GLint y, GLint width, GLint height);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLPOSTSUBBUFFERCHROMIUMPROC) (
-        GLint x, GLint y, GLint width, GLint height);
+typedef void (GL_APIENTRYP PFNGLPOSTSUBBUFFERCHROMIUMPROC) (
+    GLint x, GLint y, GLint width, GLint height);
 #endif  /* GL_CHROMIUM_post_sub_buffer */
 
 /* GL_CHROMIUM_bind_uniform_location */
@@ -197,9 +175,8 @@ typedef void (
 GL_APICALL void GL_APIENTRY glBindUniformLocationCHROMIUM(
     GLuint program, GLint location, const char* name);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) (
-        GLuint program, GLint location, const char* name);
+typedef void (GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC) (
+    GLuint program, GLint location, const char* name);
 #endif  /* GL_CHROMIUM_bind_uniform_location */
 
 /* GL_CHROMIUM_command_buffer_query */
@@ -207,6 +184,7 @@ typedef void (
 #define GL_CHROMIUM_command_buffer_query 1
 
 #ifndef GL_COMMANDS_ISSUED_CHROMIUM
+// TODO(gman): Get official numbers for this constants.
 #define GL_COMMANDS_ISSUED_CHROMIUM 0x84F2
 #endif
 #endif  /* GL_CHROMIUM_command_buffer_query */
@@ -335,21 +313,19 @@ GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM(
     GLenum target, GLenum source_id, GLenum dest_id, GLint level,
     GLint internalformat);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC) (
-        GLenum target, GLenum source_id, GLenum dest_id, GLint level,
-        GLint internalformat);
+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC) (
+    GLenum target, GLenum source_id, GLenum dest_id, GLint level,
+    GLint internalformat);
 #endif  /* GL_CHROMIUM_copy_texture */
 
 /* GL_CHROMIUM_lose_context */
 #ifndef GL_CHROMIUM_lose_context
 #define GL_CHROMIUM_lose_context 1
 #ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(
-    GLenum current, GLenum other);
+GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) (GLenum current, GLenum other);
+typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) (
+    GLenum current, GLenum other);
 #endif  /* GL_CHROMIUM_lose_context */
 
 /* GL_CHROMIUM_flipy */
@@ -384,8 +360,8 @@ typedef void (
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL GLboolean GL_APIENTRY glEnableFeatureCHROMIUM(const char* feature);
 #endif
-typedef GLboolean (
-    GL_APIENTRYP PFNGLENABLEFEATURECHROMIUMPROC) (const char* feature);
+typedef GLboolean (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUMPROC) (
+    const char* feature);
 #endif  /* GL_CHROMIUM_enable_feature */
 
 /* GL_CHROMIUM_command_buffer_latency_query */
@@ -393,6 +369,7 @@ typedef GLboolean (
 #define GL_CHROMIUM_command_buffer_latency_query 1
 
 #ifndef GL_LATENCY_QUERY_CHROMIUM
+// TODO(gman): Get official numbers for these constants.
 #define GL_LATENCY_QUERY_CHROMIUM 0x84F4
 #endif
 #endif  /* GL_CHROMIUM_command_buffer_latency_query */
@@ -422,10 +399,9 @@ GL_APICALL void GL_APIENTRY glBlitFramebufferEXT(
     GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
     GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (
-        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
-        GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (
+    GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
+    GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 #endif  /* GL_EXT_framebuffer_blit */
 
 /* GL_CHROMIUM_resize */
@@ -434,8 +410,8 @@ typedef void (
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glResizeCHROMIUM(GLuint width, GLuint height);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLRESIZECHROMIUMPROC) (GLuint width, GLuint height);
+typedef void (GL_APIENTRYP PFNGLRESIZECHROMIUMPROC) (
+    GLuint width, GLuint height);
 #endif  /* GL_CHROMIUM_resize */
 
 /* GL_CHROMIUM_get_multiple */
@@ -444,23 +420,20 @@ typedef void (
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glGetMultipleIntegervCHROMIUM(
     const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
-#endif
-typedef void (
-    GL_APIENTRYP PFNGLGETMULTIPLEINTEGERVCHROMIUMPROC) (
-        const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
-#ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glGetProgramInfoCHROMIUM(
     GLuint program, GLsizei bufsize, GLsizei* size, void* info);
 #endif
-typedef void (
-    GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUMPROC) (
-        GLuint program, GLsizei bufsize, GLsizei* size, void* info);
+typedef void (GL_APIENTRYP PFNGLGETMULTIPLEINTEGERVCHROMIUMPROC) (
+   const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUMPROC) (
+   GLuint program, GLsizei bufsize, GLsizei* size, void* info);
 #endif  /* GL_CHROMIUM_get_multiple */
 
 /* GL_CHROMIUM_front_buffer_cached */
 #ifndef GL_CHROMIUM_front_buffer_cached
 #define GL_CHROMIUM_front_buffer_cached 1
 #endif  /* GL_CHROMIUM_front_buffer_cached */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 99acbc4..e46fa90 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -2313,197 +2313,6 @@ _FUNCTION_INFO = {
 }
 
 
-_CHROMIUM_SPECIFIC_CONSTANTS = {
-  'GL_CONTEXT_LOST': '0x300E',  # TODO(gman): What value?
-}
-
-
-_CHROMIUM_SPECIFIC_EXTENSIONS = {
-  'GL_EXT_framebuffer_multisample': {
-    'constants': {
-      'GL_DRAW_FRAMEBUFFER_BINDING': '0x8CA6',
-      'GL_DRAW_FRAMEBUFFER_BINDING_EXT': 'GL_DRAW_FRAMEBUFFER_BINDING',
-      'GL_FRAMEBUFFER_BINDING': '0x8CA6',
-      'GL_FRAMEBUFFER_BINDING_EXT': 'GL_FRAMEBUFFER_BINDING',
-      'GL_RENDERBUFFER_BINDING': '0x8CA7',
-      'GL_RENDERBUFFER_BINDING_EXT': 'GL_RENDERBUFFER_BINDING',
-      'GL_READ_FRAMEBUFFER': '0x8CA8',
-      'GL_READ_FRAMEBUFFER_EXT': 'GL_READ_FRAMEBUFFER',
-      'GL_DRAW_FRAMEBUFFER': '0x8CA9',
-      'GL_DRAW_FRAMEBUFFER_EXT': 'GL_DRAW_FRAMEBUFFER',
-      'GL_READ_FRAMEBUFFER_BINDING': '0x8CAA',
-      'GL_READ_FRAMEBUFFER_BINDING_EXT': 'GL_READ_FRAMEBUFFER_BINDING',
-      'GL_RENDERBUFFER_SAMPLES': '0x8CAB',
-      'GL_RENDERBUFFER_SAMPLES_EXT': 'GL_RENDERBUFFER_SAMPLES',
-      'GL_MAX_SAMPLES': '0x8D57',
-      'GL_MAX_SAMPLES_EXT': 'GL_MAX_SAMPLES',
-      'GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE': '0x8D56',
-      'GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT':
-          'GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE',
-    },
-  },
-  'GL_EXT_framebuffer_blit': {
-    'functions': [
-      'BlitFramebufferEXT',
-    ],
-  },
-  'GL_CHROMIUM_map_sub': {
-    'constants': {
-      'GL_READ_ONLY': '0x88B8',
-      'GL_WRITE_ONLY': '0x88B9',
-    },
-    'functions': [
-      'MapBufferSubDataCHROMIUM',
-      'UnmapBufferSubDataCHROMIUM',
-      'MapTexSubImage2DCHROMIUM',
-      'UnmapTexSubImage2DCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_resize': {
-    'functions': [
-      'ResizeCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_request_extension': {
-    'functions': [
-      'GetRequestableExtensionsCHROMIUM',
-      'RequestExtensionCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_rate_limit_offscreen_context': {
-    'functions': [
-      'RateLimitOffscreenContextCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_get_multiple': {
-    'functions': [
-      'GetMultipleIntegervCHROMIUM',
-      'GetProgramInfoCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_flipy': {
-    'constants': {
-      'GL_UNPACK_FLIP_Y_CHROMIUM': '0x9240',
-    },
-  },
-  'GL_CHROMIUM_texture_compression_dxt3': {
-    'constants': {
-      'GL_COMPRESSED_RGBA_S3TC_DXT3_EXT': '0x83F2',
-    },
-  },
-  'GL_CHROMIUM_texture_compression_dxt5': {
-    'constants': {
-      'GL_COMPRESSED_RGBA_S3TC_DXT5_EXT': '0x83F3',
-    },
-  },
-  'GL_CHROMIUM_enable_feature': {
-    'functions': [
-      'EnableFeatureCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_post_sub_buffer': {
-    'functions': [
-      'PostSubBufferCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_front_buffer_cached': {
-  },
-  'GL_CHROMIUM_gpu_memory_manager': {
-    'constants': {
-      'GL_TEXTURE_POOL_CHROMIUM': '0x6000',
-      'GL_TEXTURE_POOL_MANAGED_CHROMIUM': '0x6001',
-      'GL_TEXTURE_POOL_UNMANAGED_CHROMIUM': '0x6002',
-    },
-  },
-  'GL_ARB_robustness': {
-    'constants': {
-      'GL_GUILTY_CONTEXT_RESET_ARB': '0x8253',
-      'GL_INNOCENT_CONTEXT_RESET_ARB': '0x8254',
-      'GL_UNKNOWN_CONTEXT_RESET_ARB': '0x8255',
-    },
-  },
-  'GL_ARB_texture_rectangle': {
-    'constants': {
-      'GL_TEXTURE_RECTANGLE_ARB': '0x84F5',
-      'GL_TEXTURE_BINDING_RECTANGLE_ARB': '0x84F6',
-      'GL_SAMPLER_2D_RECT_ARB': '0x8B63',
-    },
-  },
-  'GL_CHROMIUM_iosurface': {
-    'functions': [
-      'TexImageIOSurface2DCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_copy_texture': {
-    'constants': {
-      'GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM': '0x9241',
-      'GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM': '0x9242',
-      'GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM': '0x9243',
-    },
-    'functions': [
-      'CopyTextureCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_command_buffer_query': {
-    'constants': {
-      # TODO(gman): Get official numbers for these constants.
-      'GL_COMMANDS_ISSUED_CHROMIUM': '0x84F2',
-    },
-  },
-  'GL_CHROMIUM_get_error_query': {
-    'constants': {
-      # TODO(gman): Get official numbers for these constants.
-      'GL_GET_ERROR_QUERY_CHROMIUM': '0x84F3',
-    },
-  },
-  'GL_CHROMIUM_command_buffer_latency_query': {
-    'constants': {
-      # TODO(gman): Get official numbers for these constants.
-      'GL_LATENCY_QUERY_CHROMIUM': '0x84F4',
-    },
-  },
-  'GL_CHROMIUM_texture_mailbox': {
-    'constants': {
-      'GL_MAILBOX_SIZE_CHROMIUM': '64',
-    },
-    'functions': [
-      'GenMailboxCHROMIUM',
-      'ProduceTextureCHROMIUM',
-      'ConsumeTextureCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_bind_uniform_location': {
-    'functions': [
-      'BindUniformLocationCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_texture_from_image': {
-    'functions': [
-      'BindTexImage2DCHROMIUM',
-      'ReleaseTexImage2DCHROMIUM',
-    ],
-  },
-  'GL_CHROMIUM_pixel_transfer_buffer_object': {
-    'constants': {
-      # TODO(reveman): Get official numbers for these constants.
-      'GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM': '0x88EC',
-      'GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM': '0x88EF',
-    },
-  },
-  'GL_CHROMIUM_async_pixel_transfers': {
-    'constants': {
-      # TODO(reveman): Get official numbers for these constants.
-      'GL_ASYNC_PIXEL_TRANSFERS_COMPLETED_CHROMIUM': '0x84F5',
-    },
-  },
-  'GL_CHROMIUM_lose_context': {
-    'functions': [
-      'LoseContextCHROMIUM',
-    ],
-  },
-}
-
-
 def Grouper(n, iterable, fillvalue=None):
   """Collect data into fixed-length chunks or blocks"""
   args = [iter(iterable)] * n
@@ -7274,84 +7083,12 @@ void GLES2DecoderTestBase::SetupInitStateExpectations() {
         filename,
         "// This file contains Chromium-specific GLES2 declarations.\n\n")
 
-    file.Write("#include <GLES2/gl2platform.h>\n")
-
-    for name, value in _CHROMIUM_SPECIFIC_CONSTANTS.iteritems():
-      file.Write("#define %s %s\n" % (name, value))
-
-    file.Write("""
-// Because we are using both the real system GL and our own
-// emulated GL we need to use different names to avoid conflicts.
-#if defined(GLES2_USE_CPP_BINDINGS)
-#define GLES2_GET_FUN(name) gles2::GetGLContext()->name
-#else
-#define GLES2_GET_FUN(name) GLES2 ## name
-#endif
-
-""")
-
     for func in self.original_functions:
       func.WriteGLES2Header(file)
 
     file.Write("\n")
     file.Close()
 
-  def WriteGLES2ExtHeader(self, filename):
-    """Writes the GLES2 extensions header."""
-    file = CHeaderWriter(
-        filename,
-        "// This file contains Chromium-specific "
-        "GLES2 extensions declarations.\n\n")
-
-    file.Write("#include <GLES2/gl2chromium.h>\n")
-    file.Write("""#ifdef __cplusplus
-extern "C" {
-#endif
-""")
-
-    for ext_name, ext_dict in _CHROMIUM_SPECIFIC_EXTENSIONS.iteritems():
-      file.Write("""
-/* %(name)s */
-#ifndef %(name)s
-#define %(name)s 1
-""" % {'name' : ext_name})
-      for name, value in ext_dict.get('constants', {}).iteritems():
-        file.Write("""
-#ifndef %(name)s
-#define %(name)s %(value)s
-#endif
-""" % {'name': name, 'value': value})
-
-      for name in ext_dict.get('functions', []):
-        found = False
-        for function in self.original_functions:
-          if function.name != name:
-            continue
-          file.Write("#ifdef GL_GLEXT_PROTOTYPES\n")
-          file.Write("GL_APICALL %s GL_APIENTRY gl%s(%s);\n" % (
-              function.return_type,
-              function.name,
-              function.MakeTypedOriginalArgString(prefix='')))
-          file.Write("#endif\n")
-          file.Write("typedef %s (GL_APIENTRYP %s) (%s);\n" % (
-              function.return_type,
-              'PFNGL%sPROC' % function.name.upper(),
-              function.MakeTypedOriginalArgString(prefix='')))
-          found = True
-          break
-        if not found:
-          self.Error("Function '%s' not found." % name)
-
-      file.Write("#endif  /* %s */\n" % ext_name)
-
-    file.Write("""#ifdef __cplusplus
-}
-#endif
-""")
-
-    file.Write("\n")
-    file.Close()
-
   def WriteGLES2CLibImplementation(self, filename):
     """Writes the GLES2 c lib implementation."""
     file = CHeaderWriter(
@@ -7832,8 +7569,7 @@ def main(argv):
         "service/gles2_cmd_validation_implementation_autogen.h")
     gen.WriteCommonUtilsHeader("common/gles2_cmd_utils_autogen.h")
     gen.WriteCommonUtilsImpl("common/gles2_cmd_utils_implementation_autogen.h")
-    gen.WriteGLES2Header("../GLES2/gl2chromium.h")
-    gen.WriteGLES2ExtHeader("../GLES2/gl2extchromium.h")
+    gen.WriteGLES2Header("../GLES2/gl2chromium_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors