Implements Validation for all GLenum arguments and

GLint arguments that have specific valid values.

Will add unit tests in separate CL as I expect
to be able to auto generate unit tests.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/505016

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

2 files changed, 361 insertions, 357 deletions

diff --git a/gpu/command_buffer/common/gles2_cmd_id_test.cc b/gpu/command_buffer/common/gles2_cmd_id_test.cc
index 401ce5b..5cdf61df 100644
--- a/gpu/command_buffer/common/gles2_cmd_id_test.cc
+++ b/gpu/command_buffer/common/gles2_cmd_id_test.cc
@@ -1,4 +1,3 @@
-
 // Copyright (c) 2009 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.
@@ -11,362 +10,8 @@
 namespace gpu {
 namespace gles2 {
 
-// *** These IDs MUST NOT CHANGE!!! ***
-// Changing them will break all client programs.
-TEST(GLES2CommandIdTest, CommandIdsMatch) {
-  COMPILE_ASSERT(ActiveTexture::kCmdId == 256,
-                 GLES2_ActiveTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(AttachShader::kCmdId == 257,
-                 GLES2_AttachShader_kCmdId_mismatch);
-  COMPILE_ASSERT(BindAttribLocation::kCmdId == 258,
-                 GLES2_BindAttribLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(BindAttribLocationImmediate::kCmdId == 259,
-                 GLES2_BindAttribLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(BindBuffer::kCmdId == 260,
-                 GLES2_BindBuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindFramebuffer::kCmdId == 261,
-                 GLES2_BindFramebuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindRenderbuffer::kCmdId == 262,
-                 GLES2_BindRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindTexture::kCmdId == 263,
-                 GLES2_BindTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendColor::kCmdId == 264,
-                 GLES2_BlendColor_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendEquation::kCmdId == 265,
-                 GLES2_BlendEquation_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendEquationSeparate::kCmdId == 266,
-                 GLES2_BlendEquationSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendFunc::kCmdId == 267,
-                 GLES2_BlendFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendFuncSeparate::kCmdId == 268,
-                 GLES2_BlendFuncSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferData::kCmdId == 269,
-                 GLES2_BufferData_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferDataImmediate::kCmdId == 270,
-                 GLES2_BufferDataImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferSubData::kCmdId == 271,
-                 GLES2_BufferSubData_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferSubDataImmediate::kCmdId == 272,
-                 GLES2_BufferSubDataImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CheckFramebufferStatus::kCmdId == 273,
-                 GLES2_CheckFramebufferStatus_kCmdId_mismatch);
-  COMPILE_ASSERT(Clear::kCmdId == 274,
-                 GLES2_Clear_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearColor::kCmdId == 275,
-                 GLES2_ClearColor_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearDepthf::kCmdId == 276,
-                 GLES2_ClearDepthf_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearStencil::kCmdId == 277,
-                 GLES2_ClearStencil_kCmdId_mismatch);
-  COMPILE_ASSERT(ColorMask::kCmdId == 278,
-                 GLES2_ColorMask_kCmdId_mismatch);
-  COMPILE_ASSERT(CompileShader::kCmdId == 279,
-                 GLES2_CompileShader_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexImage2D::kCmdId == 280,
-                 GLES2_CompressedTexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexImage2DImmediate::kCmdId == 281,
-                 GLES2_CompressedTexImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexSubImage2D::kCmdId == 282,
-                 GLES2_CompressedTexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexSubImage2DImmediate::kCmdId == 283,
-                 GLES2_CompressedTexSubImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CopyTexImage2D::kCmdId == 284,
-                 GLES2_CopyTexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CopyTexSubImage2D::kCmdId == 285,
-                 GLES2_CopyTexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CreateProgram::kCmdId == 286,
-                 GLES2_CreateProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(CreateShader::kCmdId == 287,
-                 GLES2_CreateShader_kCmdId_mismatch);
-  COMPILE_ASSERT(CullFace::kCmdId == 288,
-                 GLES2_CullFace_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteBuffers::kCmdId == 289,
-                 GLES2_DeleteBuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteBuffersImmediate::kCmdId == 290,
-                 GLES2_DeleteBuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteFramebuffers::kCmdId == 291,
-                 GLES2_DeleteFramebuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteFramebuffersImmediate::kCmdId == 292,
-                 GLES2_DeleteFramebuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteProgram::kCmdId == 293,
-                 GLES2_DeleteProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteRenderbuffers::kCmdId == 294,
-                 GLES2_DeleteRenderbuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteRenderbuffersImmediate::kCmdId == 295,
-                 GLES2_DeleteRenderbuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteShader::kCmdId == 296,
-                 GLES2_DeleteShader_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteTextures::kCmdId == 297,
-                 GLES2_DeleteTextures_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteTexturesImmediate::kCmdId == 298,
-                 GLES2_DeleteTexturesImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthFunc::kCmdId == 299,
-                 GLES2_DepthFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthMask::kCmdId == 300,
-                 GLES2_DepthMask_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthRangef::kCmdId == 301,
-                 GLES2_DepthRangef_kCmdId_mismatch);
-  COMPILE_ASSERT(DetachShader::kCmdId == 302,
-                 GLES2_DetachShader_kCmdId_mismatch);
-  COMPILE_ASSERT(Disable::kCmdId == 303,
-                 GLES2_Disable_kCmdId_mismatch);
-  COMPILE_ASSERT(DisableVertexAttribArray::kCmdId == 304,
-                 GLES2_DisableVertexAttribArray_kCmdId_mismatch);
-  COMPILE_ASSERT(DrawArrays::kCmdId == 305,
-                 GLES2_DrawArrays_kCmdId_mismatch);
-  COMPILE_ASSERT(DrawElements::kCmdId == 306,
-                 GLES2_DrawElements_kCmdId_mismatch);
-  COMPILE_ASSERT(Enable::kCmdId == 307,
-                 GLES2_Enable_kCmdId_mismatch);
-  COMPILE_ASSERT(EnableVertexAttribArray::kCmdId == 308,
-                 GLES2_EnableVertexAttribArray_kCmdId_mismatch);
-  COMPILE_ASSERT(Finish::kCmdId == 309,
-                 GLES2_Finish_kCmdId_mismatch);
-  COMPILE_ASSERT(Flush::kCmdId == 310,
-                 GLES2_Flush_kCmdId_mismatch);
-  COMPILE_ASSERT(FramebufferRenderbuffer::kCmdId == 311,
-                 GLES2_FramebufferRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(FramebufferTexture2D::kCmdId == 312,
-                 GLES2_FramebufferTexture2D_kCmdId_mismatch);
-  COMPILE_ASSERT(FrontFace::kCmdId == 313,
-                 GLES2_FrontFace_kCmdId_mismatch);
-  COMPILE_ASSERT(GenBuffers::kCmdId == 314,
-                 GLES2_GenBuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenBuffersImmediate::kCmdId == 315,
-                 GLES2_GenBuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenerateMipmap::kCmdId == 316,
-                 GLES2_GenerateMipmap_kCmdId_mismatch);
-  COMPILE_ASSERT(GenFramebuffers::kCmdId == 317,
-                 GLES2_GenFramebuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenFramebuffersImmediate::kCmdId == 318,
-                 GLES2_GenFramebuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenRenderbuffers::kCmdId == 319,
-                 GLES2_GenRenderbuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenRenderbuffersImmediate::kCmdId == 320,
-                 GLES2_GenRenderbuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenTextures::kCmdId == 321,
-                 GLES2_GenTextures_kCmdId_mismatch);
-  COMPILE_ASSERT(GenTexturesImmediate::kCmdId == 322,
-                 GLES2_GenTexturesImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetActiveAttrib::kCmdId == 323,
-                 GLES2_GetActiveAttrib_kCmdId_mismatch);
-  COMPILE_ASSERT(GetActiveUniform::kCmdId == 324,
-                 GLES2_GetActiveUniform_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttachedShaders::kCmdId == 325,
-                 GLES2_GetAttachedShaders_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttribLocation::kCmdId == 326,
-                 GLES2_GetAttribLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttribLocationImmediate::kCmdId == 327,
-                 GLES2_GetAttribLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetBooleanv::kCmdId == 328,
-                 GLES2_GetBooleanv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetBufferParameteriv::kCmdId == 329,
-                 GLES2_GetBufferParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetError::kCmdId == 330,
-                 GLES2_GetError_kCmdId_mismatch);
-  COMPILE_ASSERT(GetFloatv::kCmdId == 331,
-                 GLES2_GetFloatv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetFramebufferAttachmentParameteriv::kCmdId == 332,
-                 GLES2_GetFramebufferAttachmentParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetIntegerv::kCmdId == 333,
-                 GLES2_GetIntegerv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetProgramiv::kCmdId == 334,
-                 GLES2_GetProgramiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetProgramInfoLog::kCmdId == 335,
-                 GLES2_GetProgramInfoLog_kCmdId_mismatch);
-  COMPILE_ASSERT(GetRenderbufferParameteriv::kCmdId == 336,
-                 GLES2_GetRenderbufferParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderiv::kCmdId == 337,
-                 GLES2_GetShaderiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderInfoLog::kCmdId == 338,
-                 GLES2_GetShaderInfoLog_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderPrecisionFormat::kCmdId == 339,
-                 GLES2_GetShaderPrecisionFormat_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderSource::kCmdId == 340,
-                 GLES2_GetShaderSource_kCmdId_mismatch);
-  COMPILE_ASSERT(GetString::kCmdId == 341,
-                 GLES2_GetString_kCmdId_mismatch);
-  COMPILE_ASSERT(GetTexParameterfv::kCmdId == 342,
-                 GLES2_GetTexParameterfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetTexParameteriv::kCmdId == 343,
-                 GLES2_GetTexParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformfv::kCmdId == 344,
-                 GLES2_GetUniformfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformiv::kCmdId == 345,
-                 GLES2_GetUniformiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformLocation::kCmdId == 346,
-                 GLES2_GetUniformLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformLocationImmediate::kCmdId == 347,
-                 GLES2_GetUniformLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribfv::kCmdId == 348,
-                 GLES2_GetVertexAttribfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribiv::kCmdId == 349,
-                 GLES2_GetVertexAttribiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribPointerv::kCmdId == 350,
-                 GLES2_GetVertexAttribPointerv_kCmdId_mismatch);
-  COMPILE_ASSERT(Hint::kCmdId == 351,
-                 GLES2_Hint_kCmdId_mismatch);
-  COMPILE_ASSERT(IsBuffer::kCmdId == 352,
-                 GLES2_IsBuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsEnabled::kCmdId == 353,
-                 GLES2_IsEnabled_kCmdId_mismatch);
-  COMPILE_ASSERT(IsFramebuffer::kCmdId == 354,
-                 GLES2_IsFramebuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsProgram::kCmdId == 355,
-                 GLES2_IsProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(IsRenderbuffer::kCmdId == 356,
-                 GLES2_IsRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsShader::kCmdId == 357,
-                 GLES2_IsShader_kCmdId_mismatch);
-  COMPILE_ASSERT(IsTexture::kCmdId == 358,
-                 GLES2_IsTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(LineWidth::kCmdId == 359,
-                 GLES2_LineWidth_kCmdId_mismatch);
-  COMPILE_ASSERT(LinkProgram::kCmdId == 360,
-                 GLES2_LinkProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(PixelStorei::kCmdId == 361,
-                 GLES2_PixelStorei_kCmdId_mismatch);
-  COMPILE_ASSERT(PolygonOffset::kCmdId == 362,
-                 GLES2_PolygonOffset_kCmdId_mismatch);
-  COMPILE_ASSERT(ReadPixels::kCmdId == 363,
-                 GLES2_ReadPixels_kCmdId_mismatch);
-  COMPILE_ASSERT(RenderbufferStorage::kCmdId == 364,
-                 GLES2_RenderbufferStorage_kCmdId_mismatch);
-  COMPILE_ASSERT(SampleCoverage::kCmdId == 365,
-                 GLES2_SampleCoverage_kCmdId_mismatch);
-  COMPILE_ASSERT(Scissor::kCmdId == 366,
-                 GLES2_Scissor_kCmdId_mismatch);
-  COMPILE_ASSERT(ShaderSource::kCmdId == 367,
-                 GLES2_ShaderSource_kCmdId_mismatch);
-  COMPILE_ASSERT(ShaderSourceImmediate::kCmdId == 368,
-                 GLES2_ShaderSourceImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilFunc::kCmdId == 369,
-                 GLES2_StencilFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilFuncSeparate::kCmdId == 370,
-                 GLES2_StencilFuncSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilMask::kCmdId == 371,
-                 GLES2_StencilMask_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilMaskSeparate::kCmdId == 372,
-                 GLES2_StencilMaskSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilOp::kCmdId == 373,
-                 GLES2_StencilOp_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilOpSeparate::kCmdId == 374,
-                 GLES2_StencilOpSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexImage2D::kCmdId == 375,
-                 GLES2_TexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(TexImage2DImmediate::kCmdId == 376,
-                 GLES2_TexImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterf::kCmdId == 377,
-                 GLES2_TexParameterf_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterfv::kCmdId == 378,
-                 GLES2_TexParameterfv_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterfvImmediate::kCmdId == 379,
-                 GLES2_TexParameterfvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameteri::kCmdId == 380,
-                 GLES2_TexParameteri_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameteriv::kCmdId == 381,
-                 GLES2_TexParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterivImmediate::kCmdId == 382,
-                 GLES2_TexParameterivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexSubImage2D::kCmdId == 383,
-                 GLES2_TexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(TexSubImage2DImmediate::kCmdId == 384,
-                 GLES2_TexSubImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1f::kCmdId == 385,
-                 GLES2_Uniform1f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1fv::kCmdId == 386,
-                 GLES2_Uniform1fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1fvImmediate::kCmdId == 387,
-                 GLES2_Uniform1fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1i::kCmdId == 388,
-                 GLES2_Uniform1i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1iv::kCmdId == 389,
-                 GLES2_Uniform1iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1ivImmediate::kCmdId == 390,
-                 GLES2_Uniform1ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2f::kCmdId == 391,
-                 GLES2_Uniform2f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2fv::kCmdId == 392,
-                 GLES2_Uniform2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2fvImmediate::kCmdId == 393,
-                 GLES2_Uniform2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2i::kCmdId == 394,
-                 GLES2_Uniform2i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2iv::kCmdId == 395,
-                 GLES2_Uniform2iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2ivImmediate::kCmdId == 396,
-                 GLES2_Uniform2ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3f::kCmdId == 397,
-                 GLES2_Uniform3f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3fv::kCmdId == 398,
-                 GLES2_Uniform3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3fvImmediate::kCmdId == 399,
-                 GLES2_Uniform3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3i::kCmdId == 400,
-                 GLES2_Uniform3i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3iv::kCmdId == 401,
-                 GLES2_Uniform3iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3ivImmediate::kCmdId == 402,
-                 GLES2_Uniform3ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4f::kCmdId == 403,
-                 GLES2_Uniform4f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4fv::kCmdId == 404,
-                 GLES2_Uniform4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4fvImmediate::kCmdId == 405,
-                 GLES2_Uniform4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4i::kCmdId == 406,
-                 GLES2_Uniform4i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4iv::kCmdId == 407,
-                 GLES2_Uniform4iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4ivImmediate::kCmdId == 408,
-                 GLES2_Uniform4ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix2fv::kCmdId == 409,
-                 GLES2_UniformMatrix2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix2fvImmediate::kCmdId == 410,
-                 GLES2_UniformMatrix2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix3fv::kCmdId == 411,
-                 GLES2_UniformMatrix3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix3fvImmediate::kCmdId == 412,
-                 GLES2_UniformMatrix3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix4fv::kCmdId == 413,
-                 GLES2_UniformMatrix4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix4fvImmediate::kCmdId == 414,
-                 GLES2_UniformMatrix4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UseProgram::kCmdId == 415,
-                 GLES2_UseProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(ValidateProgram::kCmdId == 416,
-                 GLES2_ValidateProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1f::kCmdId == 417,
-                 GLES2_VertexAttrib1f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1fv::kCmdId == 418,
-                 GLES2_VertexAttrib1fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1fvImmediate::kCmdId == 419,
-                 GLES2_VertexAttrib1fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2f::kCmdId == 420,
-                 GLES2_VertexAttrib2f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2fv::kCmdId == 421,
-                 GLES2_VertexAttrib2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2fvImmediate::kCmdId == 422,
-                 GLES2_VertexAttrib2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3f::kCmdId == 423,
-                 GLES2_VertexAttrib3f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3fv::kCmdId == 424,
-                 GLES2_VertexAttrib3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3fvImmediate::kCmdId == 425,
-                 GLES2_VertexAttrib3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4f::kCmdId == 426,
-                 GLES2_VertexAttrib4f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4fv::kCmdId == 427,
-                 GLES2_VertexAttrib4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4fvImmediate::kCmdId == 428,
-                 GLES2_VertexAttrib4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttribPointer::kCmdId == 429,
-                 GLES2_VertexAttribPointer_kCmdId_mismatch);
-  COMPILE_ASSERT(Viewport::kCmdId == 430,
-                 GLES2_Viewport_kCmdId_mismatch);
-  COMPILE_ASSERT(SwapBuffers::kCmdId == 431,
-                 GLES2_SwapBuffers_kCmdId_mismatch);
-}
+#include "gpu/command_buffer/common/gles2_cmd_id_test_autogen.h"
+
 }  // namespace gles2
 }  // namespace gpu
 
diff --git a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
new file mode 100644
index 0000000..4f3e0d9
--- /dev/null
+++ b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
@@ -0,0 +1,359 @@
+// This file contains unit tests for gles2 commmand ids
+
+// *** These IDs MUST NOT CHANGE!!! ***
+// Changing them will break all client programs.
+TEST(GLES2CommandIdTest, CommandIdsMatch) {
+  COMPILE_ASSERT(ActiveTexture::kCmdId == 256,
+                 GLES2_ActiveTexture_kCmdId_mismatch);
+  COMPILE_ASSERT(AttachShader::kCmdId == 257,
+                 GLES2_AttachShader_kCmdId_mismatch);
+  COMPILE_ASSERT(BindAttribLocation::kCmdId == 258,
+                 GLES2_BindAttribLocation_kCmdId_mismatch);
+  COMPILE_ASSERT(BindAttribLocationImmediate::kCmdId == 259,
+                 GLES2_BindAttribLocationImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(BindBuffer::kCmdId == 260,
+                 GLES2_BindBuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(BindFramebuffer::kCmdId == 261,
+                 GLES2_BindFramebuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(BindRenderbuffer::kCmdId == 262,
+                 GLES2_BindRenderbuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(BindTexture::kCmdId == 263,
+                 GLES2_BindTexture_kCmdId_mismatch);
+  COMPILE_ASSERT(BlendColor::kCmdId == 264,
+                 GLES2_BlendColor_kCmdId_mismatch);
+  COMPILE_ASSERT(BlendEquation::kCmdId == 265,
+                 GLES2_BlendEquation_kCmdId_mismatch);
+  COMPILE_ASSERT(BlendEquationSeparate::kCmdId == 266,
+                 GLES2_BlendEquationSeparate_kCmdId_mismatch);
+  COMPILE_ASSERT(BlendFunc::kCmdId == 267,
+                 GLES2_BlendFunc_kCmdId_mismatch);
+  COMPILE_ASSERT(BlendFuncSeparate::kCmdId == 268,
+                 GLES2_BlendFuncSeparate_kCmdId_mismatch);
+  COMPILE_ASSERT(BufferData::kCmdId == 269,
+                 GLES2_BufferData_kCmdId_mismatch);
+  COMPILE_ASSERT(BufferDataImmediate::kCmdId == 270,
+                 GLES2_BufferDataImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(BufferSubData::kCmdId == 271,
+                 GLES2_BufferSubData_kCmdId_mismatch);
+  COMPILE_ASSERT(BufferSubDataImmediate::kCmdId == 272,
+                 GLES2_BufferSubDataImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(CheckFramebufferStatus::kCmdId == 273,
+                 GLES2_CheckFramebufferStatus_kCmdId_mismatch);
+  COMPILE_ASSERT(Clear::kCmdId == 274,
+                 GLES2_Clear_kCmdId_mismatch);
+  COMPILE_ASSERT(ClearColor::kCmdId == 275,
+                 GLES2_ClearColor_kCmdId_mismatch);
+  COMPILE_ASSERT(ClearDepthf::kCmdId == 276,
+                 GLES2_ClearDepthf_kCmdId_mismatch);
+  COMPILE_ASSERT(ClearStencil::kCmdId == 277,
+                 GLES2_ClearStencil_kCmdId_mismatch);
+  COMPILE_ASSERT(ColorMask::kCmdId == 278,
+                 GLES2_ColorMask_kCmdId_mismatch);
+  COMPILE_ASSERT(CompileShader::kCmdId == 279,
+                 GLES2_CompileShader_kCmdId_mismatch);
+  COMPILE_ASSERT(CompressedTexImage2D::kCmdId == 280,
+                 GLES2_CompressedTexImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(CompressedTexImage2DImmediate::kCmdId == 281,
+                 GLES2_CompressedTexImage2DImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(CompressedTexSubImage2D::kCmdId == 282,
+                 GLES2_CompressedTexSubImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(CompressedTexSubImage2DImmediate::kCmdId == 283,
+                 GLES2_CompressedTexSubImage2DImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(CopyTexImage2D::kCmdId == 284,
+                 GLES2_CopyTexImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(CopyTexSubImage2D::kCmdId == 285,
+                 GLES2_CopyTexSubImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(CreateProgram::kCmdId == 286,
+                 GLES2_CreateProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(CreateShader::kCmdId == 287,
+                 GLES2_CreateShader_kCmdId_mismatch);
+  COMPILE_ASSERT(CullFace::kCmdId == 288,
+                 GLES2_CullFace_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteBuffers::kCmdId == 289,
+                 GLES2_DeleteBuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteBuffersImmediate::kCmdId == 290,
+                 GLES2_DeleteBuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteFramebuffers::kCmdId == 291,
+                 GLES2_DeleteFramebuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteFramebuffersImmediate::kCmdId == 292,
+                 GLES2_DeleteFramebuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteProgram::kCmdId == 293,
+                 GLES2_DeleteProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteRenderbuffers::kCmdId == 294,
+                 GLES2_DeleteRenderbuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteRenderbuffersImmediate::kCmdId == 295,
+                 GLES2_DeleteRenderbuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteShader::kCmdId == 296,
+                 GLES2_DeleteShader_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteTextures::kCmdId == 297,
+                 GLES2_DeleteTextures_kCmdId_mismatch);
+  COMPILE_ASSERT(DeleteTexturesImmediate::kCmdId == 298,
+                 GLES2_DeleteTexturesImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(DepthFunc::kCmdId == 299,
+                 GLES2_DepthFunc_kCmdId_mismatch);
+  COMPILE_ASSERT(DepthMask::kCmdId == 300,
+                 GLES2_DepthMask_kCmdId_mismatch);
+  COMPILE_ASSERT(DepthRangef::kCmdId == 301,
+                 GLES2_DepthRangef_kCmdId_mismatch);
+  COMPILE_ASSERT(DetachShader::kCmdId == 302,
+                 GLES2_DetachShader_kCmdId_mismatch);
+  COMPILE_ASSERT(Disable::kCmdId == 303,
+                 GLES2_Disable_kCmdId_mismatch);
+  COMPILE_ASSERT(DisableVertexAttribArray::kCmdId == 304,
+                 GLES2_DisableVertexAttribArray_kCmdId_mismatch);
+  COMPILE_ASSERT(DrawArrays::kCmdId == 305,
+                 GLES2_DrawArrays_kCmdId_mismatch);
+  COMPILE_ASSERT(DrawElements::kCmdId == 306,
+                 GLES2_DrawElements_kCmdId_mismatch);
+  COMPILE_ASSERT(Enable::kCmdId == 307,
+                 GLES2_Enable_kCmdId_mismatch);
+  COMPILE_ASSERT(EnableVertexAttribArray::kCmdId == 308,
+                 GLES2_EnableVertexAttribArray_kCmdId_mismatch);
+  COMPILE_ASSERT(Finish::kCmdId == 309,
+                 GLES2_Finish_kCmdId_mismatch);
+  COMPILE_ASSERT(Flush::kCmdId == 310,
+                 GLES2_Flush_kCmdId_mismatch);
+  COMPILE_ASSERT(FramebufferRenderbuffer::kCmdId == 311,
+                 GLES2_FramebufferRenderbuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(FramebufferTexture2D::kCmdId == 312,
+                 GLES2_FramebufferTexture2D_kCmdId_mismatch);
+  COMPILE_ASSERT(FrontFace::kCmdId == 313,
+                 GLES2_FrontFace_kCmdId_mismatch);
+  COMPILE_ASSERT(GenBuffers::kCmdId == 314,
+                 GLES2_GenBuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(GenBuffersImmediate::kCmdId == 315,
+                 GLES2_GenBuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GenerateMipmap::kCmdId == 316,
+                 GLES2_GenerateMipmap_kCmdId_mismatch);
+  COMPILE_ASSERT(GenFramebuffers::kCmdId == 317,
+                 GLES2_GenFramebuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(GenFramebuffersImmediate::kCmdId == 318,
+                 GLES2_GenFramebuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GenRenderbuffers::kCmdId == 319,
+                 GLES2_GenRenderbuffers_kCmdId_mismatch);
+  COMPILE_ASSERT(GenRenderbuffersImmediate::kCmdId == 320,
+                 GLES2_GenRenderbuffersImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GenTextures::kCmdId == 321,
+                 GLES2_GenTextures_kCmdId_mismatch);
+  COMPILE_ASSERT(GenTexturesImmediate::kCmdId == 322,
+                 GLES2_GenTexturesImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GetActiveAttrib::kCmdId == 323,
+                 GLES2_GetActiveAttrib_kCmdId_mismatch);
+  COMPILE_ASSERT(GetActiveUniform::kCmdId == 324,
+                 GLES2_GetActiveUniform_kCmdId_mismatch);
+  COMPILE_ASSERT(GetAttachedShaders::kCmdId == 325,
+                 GLES2_GetAttachedShaders_kCmdId_mismatch);
+  COMPILE_ASSERT(GetAttribLocation::kCmdId == 326,
+                 GLES2_GetAttribLocation_kCmdId_mismatch);
+  COMPILE_ASSERT(GetAttribLocationImmediate::kCmdId == 327,
+                 GLES2_GetAttribLocationImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GetBooleanv::kCmdId == 328,
+                 GLES2_GetBooleanv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetBufferParameteriv::kCmdId == 329,
+                 GLES2_GetBufferParameteriv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetError::kCmdId == 330,
+                 GLES2_GetError_kCmdId_mismatch);
+  COMPILE_ASSERT(GetFloatv::kCmdId == 331,
+                 GLES2_GetFloatv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetFramebufferAttachmentParameteriv::kCmdId == 332,
+                 GLES2_GetFramebufferAttachmentParameteriv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetIntegerv::kCmdId == 333,
+                 GLES2_GetIntegerv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetProgramiv::kCmdId == 334,
+                 GLES2_GetProgramiv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetProgramInfoLog::kCmdId == 335,
+                 GLES2_GetProgramInfoLog_kCmdId_mismatch);
+  COMPILE_ASSERT(GetRenderbufferParameteriv::kCmdId == 336,
+                 GLES2_GetRenderbufferParameteriv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetShaderiv::kCmdId == 337,
+                 GLES2_GetShaderiv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetShaderInfoLog::kCmdId == 338,
+                 GLES2_GetShaderInfoLog_kCmdId_mismatch);
+  COMPILE_ASSERT(GetShaderPrecisionFormat::kCmdId == 339,
+                 GLES2_GetShaderPrecisionFormat_kCmdId_mismatch);
+  COMPILE_ASSERT(GetShaderSource::kCmdId == 340,
+                 GLES2_GetShaderSource_kCmdId_mismatch);
+  COMPILE_ASSERT(GetString::kCmdId == 341,
+                 GLES2_GetString_kCmdId_mismatch);
+  COMPILE_ASSERT(GetTexParameterfv::kCmdId == 342,
+                 GLES2_GetTexParameterfv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetTexParameteriv::kCmdId == 343,
+                 GLES2_GetTexParameteriv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetUniformfv::kCmdId == 344,
+                 GLES2_GetUniformfv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetUniformiv::kCmdId == 345,
+                 GLES2_GetUniformiv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetUniformLocation::kCmdId == 346,
+                 GLES2_GetUniformLocation_kCmdId_mismatch);
+  COMPILE_ASSERT(GetUniformLocationImmediate::kCmdId == 347,
+                 GLES2_GetUniformLocationImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(GetVertexAttribfv::kCmdId == 348,
+                 GLES2_GetVertexAttribfv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetVertexAttribiv::kCmdId == 349,
+                 GLES2_GetVertexAttribiv_kCmdId_mismatch);
+  COMPILE_ASSERT(GetVertexAttribPointerv::kCmdId == 350,
+                 GLES2_GetVertexAttribPointerv_kCmdId_mismatch);
+  COMPILE_ASSERT(Hint::kCmdId == 351,
+                 GLES2_Hint_kCmdId_mismatch);
+  COMPILE_ASSERT(IsBuffer::kCmdId == 352,
+                 GLES2_IsBuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(IsEnabled::kCmdId == 353,
+                 GLES2_IsEnabled_kCmdId_mismatch);
+  COMPILE_ASSERT(IsFramebuffer::kCmdId == 354,
+                 GLES2_IsFramebuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(IsProgram::kCmdId == 355,
+                 GLES2_IsProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(IsRenderbuffer::kCmdId == 356,
+                 GLES2_IsRenderbuffer_kCmdId_mismatch);
+  COMPILE_ASSERT(IsShader::kCmdId == 357,
+                 GLES2_IsShader_kCmdId_mismatch);
+  COMPILE_ASSERT(IsTexture::kCmdId == 358,
+                 GLES2_IsTexture_kCmdId_mismatch);
+  COMPILE_ASSERT(LineWidth::kCmdId == 359,
+                 GLES2_LineWidth_kCmdId_mismatch);
+  COMPILE_ASSERT(LinkProgram::kCmdId == 360,
+                 GLES2_LinkProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(PixelStorei::kCmdId == 361,
+                 GLES2_PixelStorei_kCmdId_mismatch);
+  COMPILE_ASSERT(PolygonOffset::kCmdId == 362,
+                 GLES2_PolygonOffset_kCmdId_mismatch);
+  COMPILE_ASSERT(ReadPixels::kCmdId == 363,
+                 GLES2_ReadPixels_kCmdId_mismatch);
+  COMPILE_ASSERT(RenderbufferStorage::kCmdId == 364,
+                 GLES2_RenderbufferStorage_kCmdId_mismatch);
+  COMPILE_ASSERT(SampleCoverage::kCmdId == 365,
+                 GLES2_SampleCoverage_kCmdId_mismatch);
+  COMPILE_ASSERT(Scissor::kCmdId == 366,
+                 GLES2_Scissor_kCmdId_mismatch);
+  COMPILE_ASSERT(ShaderSource::kCmdId == 367,
+                 GLES2_ShaderSource_kCmdId_mismatch);
+  COMPILE_ASSERT(ShaderSourceImmediate::kCmdId == 368,
+                 GLES2_ShaderSourceImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilFunc::kCmdId == 369,
+                 GLES2_StencilFunc_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilFuncSeparate::kCmdId == 370,
+                 GLES2_StencilFuncSeparate_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilMask::kCmdId == 371,
+                 GLES2_StencilMask_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilMaskSeparate::kCmdId == 372,
+                 GLES2_StencilMaskSeparate_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilOp::kCmdId == 373,
+                 GLES2_StencilOp_kCmdId_mismatch);
+  COMPILE_ASSERT(StencilOpSeparate::kCmdId == 374,
+                 GLES2_StencilOpSeparate_kCmdId_mismatch);
+  COMPILE_ASSERT(TexImage2D::kCmdId == 375,
+                 GLES2_TexImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(TexImage2DImmediate::kCmdId == 376,
+                 GLES2_TexImage2DImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameterf::kCmdId == 377,
+                 GLES2_TexParameterf_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameterfv::kCmdId == 378,
+                 GLES2_TexParameterfv_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameterfvImmediate::kCmdId == 379,
+                 GLES2_TexParameterfvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameteri::kCmdId == 380,
+                 GLES2_TexParameteri_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameteriv::kCmdId == 381,
+                 GLES2_TexParameteriv_kCmdId_mismatch);
+  COMPILE_ASSERT(TexParameterivImmediate::kCmdId == 382,
+                 GLES2_TexParameterivImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(TexSubImage2D::kCmdId == 383,
+                 GLES2_TexSubImage2D_kCmdId_mismatch);
+  COMPILE_ASSERT(TexSubImage2DImmediate::kCmdId == 384,
+                 GLES2_TexSubImage2DImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1f::kCmdId == 385,
+                 GLES2_Uniform1f_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1fv::kCmdId == 386,
+                 GLES2_Uniform1fv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1fvImmediate::kCmdId == 387,
+                 GLES2_Uniform1fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1i::kCmdId == 388,
+                 GLES2_Uniform1i_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1iv::kCmdId == 389,
+                 GLES2_Uniform1iv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform1ivImmediate::kCmdId == 390,
+                 GLES2_Uniform1ivImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2f::kCmdId == 391,
+                 GLES2_Uniform2f_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2fv::kCmdId == 392,
+                 GLES2_Uniform2fv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2fvImmediate::kCmdId == 393,
+                 GLES2_Uniform2fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2i::kCmdId == 394,
+                 GLES2_Uniform2i_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2iv::kCmdId == 395,
+                 GLES2_Uniform2iv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform2ivImmediate::kCmdId == 396,
+                 GLES2_Uniform2ivImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3f::kCmdId == 397,
+                 GLES2_Uniform3f_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3fv::kCmdId == 398,
+                 GLES2_Uniform3fv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3fvImmediate::kCmdId == 399,
+                 GLES2_Uniform3fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3i::kCmdId == 400,
+                 GLES2_Uniform3i_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3iv::kCmdId == 401,
+                 GLES2_Uniform3iv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform3ivImmediate::kCmdId == 402,
+                 GLES2_Uniform3ivImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4f::kCmdId == 403,
+                 GLES2_Uniform4f_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4fv::kCmdId == 404,
+                 GLES2_Uniform4fv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4fvImmediate::kCmdId == 405,
+                 GLES2_Uniform4fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4i::kCmdId == 406,
+                 GLES2_Uniform4i_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4iv::kCmdId == 407,
+                 GLES2_Uniform4iv_kCmdId_mismatch);
+  COMPILE_ASSERT(Uniform4ivImmediate::kCmdId == 408,
+                 GLES2_Uniform4ivImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix2fv::kCmdId == 409,
+                 GLES2_UniformMatrix2fv_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix2fvImmediate::kCmdId == 410,
+                 GLES2_UniformMatrix2fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix3fv::kCmdId == 411,
+                 GLES2_UniformMatrix3fv_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix3fvImmediate::kCmdId == 412,
+                 GLES2_UniformMatrix3fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix4fv::kCmdId == 413,
+                 GLES2_UniformMatrix4fv_kCmdId_mismatch);
+  COMPILE_ASSERT(UniformMatrix4fvImmediate::kCmdId == 414,
+                 GLES2_UniformMatrix4fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(UseProgram::kCmdId == 415,
+                 GLES2_UseProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(ValidateProgram::kCmdId == 416,
+                 GLES2_ValidateProgram_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib1f::kCmdId == 417,
+                 GLES2_VertexAttrib1f_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib1fv::kCmdId == 418,
+                 GLES2_VertexAttrib1fv_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib1fvImmediate::kCmdId == 419,
+                 GLES2_VertexAttrib1fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib2f::kCmdId == 420,
+                 GLES2_VertexAttrib2f_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib2fv::kCmdId == 421,
+                 GLES2_VertexAttrib2fv_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib2fvImmediate::kCmdId == 422,
+                 GLES2_VertexAttrib2fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib3f::kCmdId == 423,
+                 GLES2_VertexAttrib3f_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib3fv::kCmdId == 424,
+                 GLES2_VertexAttrib3fv_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib3fvImmediate::kCmdId == 425,
+                 GLES2_VertexAttrib3fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib4f::kCmdId == 426,
+                 GLES2_VertexAttrib4f_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib4fv::kCmdId == 427,
+                 GLES2_VertexAttrib4fv_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttrib4fvImmediate::kCmdId == 428,
+                 GLES2_VertexAttrib4fvImmediate_kCmdId_mismatch);
+  COMPILE_ASSERT(VertexAttribPointer::kCmdId == 429,
+                 GLES2_VertexAttribPointer_kCmdId_mismatch);
+  COMPILE_ASSERT(Viewport::kCmdId == 430,
+                 GLES2_Viewport_kCmdId_mismatch);
+  COMPILE_ASSERT(SwapBuffers::kCmdId == 431,
+                 GLES2_SwapBuffers_kCmdId_mismatch);
+}
+