summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 03:52:46 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 03:52:46 +0000
commit36ef10f53a293eeb4f0add97983c0c327b717d07 (patch)
tree428614652d8ad5893387692334d88b2ae4f70ba0
parente6581aff035e5ffbf2d098d34f4fff63631e3c21 (diff)
downloadchromium_src-36ef10f53a293eeb4f0add97983c0c327b717d07.zip
chromium_src-36ef10f53a293eeb4f0add97983c0c327b717d07.tar.gz
chromium_src-36ef10f53a293eeb4f0add97983c0c327b717d07.tar.bz2
Remove command buffer command id tests etc..
The command buffer is no longer a public API so it's not important that the cmd ids be static. TEST=none BUG=none R=apatrick@chromium.org Review URL: http://codereview.chromium.org/9288083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119362 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py285
-rw-r--r--gpu/command_buffer/client/gles2_implementation_unittest_autogen.h2
-rw-r--r--gpu/command_buffer/common/gles2_cmd_id_test.cc17
-rw-r--r--gpu/command_buffer/common/gles2_cmd_id_test_autogen.h419
-rw-r--r--gpu/command_buffer/common/gles2_cmd_ids_autogen.h396
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils_autogen.h2
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h4
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_validation_autogen.h2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h2
-rw-r--r--gpu/gpu.gyp2
12 files changed, 209 insertions, 926 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 258031f..c912d50 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -228,218 +228,6 @@ GL_APICALL void GL_APIENTRY glPostSubBufferCHROMIUM (GLint x, GLint y, G
GL_APICALL void GL_APIENTRY glTexImageIOSurface2DCHROMIUM (GLenumTextureBindTarget target, GLsizei width, GLsizei height, GLuint ioSurfaceId, GLuint plane);
"""
-# This is the list of all commmands that will be generated and their Id.
-# If a command is not listed in this table it is an error.
-# This lets us make sure that command ids do not change as the generator
-# generates new variations of commands.
-
-_CMD_ID_TABLE = {
- 'ActiveTexture': 256,
- 'AttachShader': 257,
- 'BindAttribLocation': 258,
- 'BindAttribLocationImmediate': 259,
- 'BindBuffer': 260,
- 'BindFramebuffer': 261,
- 'BindRenderbuffer': 262,
- 'BindTexture': 263,
- 'BlendColor': 264,
- 'BlendEquation': 265,
- 'BlendEquationSeparate': 266,
- 'BlendFunc': 267,
- 'BlendFuncSeparate': 268,
- 'BufferData': 269,
- 'BufferDataImmediate': 270,
- 'BufferSubData': 271,
- 'BufferSubDataImmediate': 272,
- 'CheckFramebufferStatus': 273,
- 'Clear': 274,
- 'ClearColor': 275,
- 'ClearDepthf': 276,
- 'ClearStencil': 277,
- 'ColorMask': 278,
- 'CompileShader': 279,
- 'CompressedTexImage2D': 280,
- 'CompressedTexImage2DImmediate': 281,
- 'CompressedTexSubImage2D': 282,
- 'CompressedTexSubImage2DImmediate': 283,
- 'CopyTexImage2D': 284,
- 'CopyTexSubImage2D': 285,
- 'CreateProgram': 286,
- 'CreateShader': 287,
- 'CullFace': 288,
- 'DeleteBuffers': 289,
- 'DeleteBuffersImmediate': 290,
- 'DeleteFramebuffers': 291,
- 'DeleteFramebuffersImmediate': 292,
- 'DeleteProgram': 293,
- 'DeleteRenderbuffers': 294,
- 'DeleteRenderbuffersImmediate': 295,
- 'DeleteShader': 296,
- 'DeleteTextures': 297,
- 'DeleteTexturesImmediate': 298,
- 'DepthFunc': 299,
- 'DepthMask': 300,
- 'DepthRangef': 301,
- 'DetachShader': 302,
- 'Disable': 303,
- 'DisableVertexAttribArray': 304,
- 'DrawArrays': 305,
- 'DrawElements': 306,
- 'Enable': 307,
- 'EnableVertexAttribArray': 308,
- 'Finish': 309,
- 'Flush': 310,
- 'FramebufferRenderbuffer': 311,
- 'FramebufferTexture2D': 312,
- 'FrontFace': 313,
- 'GenBuffers': 314,
- 'GenBuffersImmediate': 315,
- 'GenerateMipmap': 316,
- 'GenFramebuffers': 317,
- 'GenFramebuffersImmediate': 318,
- 'GenRenderbuffers': 319,
- 'GenRenderbuffersImmediate': 320,
- 'GenTextures': 321,
- 'GenTexturesImmediate': 322,
- 'GetActiveAttrib': 323,
- 'GetActiveUniform': 324,
- 'GetAttachedShaders': 325,
- 'GetAttribLocation': 326,
- 'GetAttribLocationImmediate': 327,
- 'GetBooleanv': 328,
- 'GetBufferParameteriv': 329,
- 'GetError': 330,
- 'GetFloatv': 331,
- 'GetFramebufferAttachmentParameteriv': 332,
- 'GetIntegerv': 333,
- 'GetProgramiv': 334,
- 'GetProgramInfoLog': 335,
- 'GetRenderbufferParameteriv': 336,
- 'GetShaderiv': 337,
- 'GetShaderInfoLog': 338,
- 'GetShaderPrecisionFormat': 339,
- 'GetShaderSource': 340,
- 'GetString': 341,
- 'GetTexParameterfv': 342,
- 'GetTexParameteriv': 343,
- 'GetUniformfv': 344,
- 'GetUniformiv': 345,
- 'GetUniformLocation': 346,
- 'GetUniformLocationImmediate': 347,
- 'GetVertexAttribfv': 348,
- 'GetVertexAttribiv': 349,
- 'GetVertexAttribPointerv': 350,
- 'Hint': 351,
- 'IsBuffer': 352,
- 'IsEnabled': 353,
- 'IsFramebuffer': 354,
- 'IsProgram': 355,
- 'IsRenderbuffer': 356,
- 'IsShader': 357,
- 'IsTexture': 358,
- 'LineWidth': 359,
- 'LinkProgram': 360,
- 'PixelStorei': 361,
- 'PolygonOffset': 362,
- 'ReadPixels': 363,
- 'RenderbufferStorage': 364,
- 'SampleCoverage': 365,
- 'Scissor': 366,
- 'ShaderSource': 367,
- 'ShaderSourceImmediate': 368,
- 'StencilFunc': 369,
- 'StencilFuncSeparate': 370,
- 'StencilMask': 371,
- 'StencilMaskSeparate': 372,
- 'StencilOp': 373,
- 'StencilOpSeparate': 374,
- 'TexImage2D': 375,
- 'TexImage2DImmediate': 376,
- 'TexParameterf': 377,
- 'TexParameterfv': 378,
- 'TexParameterfvImmediate': 379,
- 'TexParameteri': 380,
- 'TexParameteriv': 381,
- 'TexParameterivImmediate': 382,
- 'TexSubImage2D': 383,
- 'TexSubImage2DImmediate': 384,
- 'Uniform1f': 385,
- 'Uniform1fv': 386,
- 'Uniform1fvImmediate': 387,
- 'Uniform1i': 388,
- 'Uniform1iv': 389,
- 'Uniform1ivImmediate': 390,
- 'Uniform2f': 391,
- 'Uniform2fv': 392,
- 'Uniform2fvImmediate': 393,
- 'Uniform2i': 394,
- 'Uniform2iv': 395,
- 'Uniform2ivImmediate': 396,
- 'Uniform3f': 397,
- 'Uniform3fv': 398,
- 'Uniform3fvImmediate': 399,
- 'Uniform3i': 400,
- 'Uniform3iv': 401,
- 'Uniform3ivImmediate': 402,
- 'Uniform4f': 403,
- 'Uniform4fv': 404,
- 'Uniform4fvImmediate': 405,
- 'Uniform4i': 406,
- 'Uniform4iv': 407,
- 'Uniform4ivImmediate': 408,
- 'UniformMatrix2fv': 409,
- 'UniformMatrix2fvImmediate': 410,
- 'UniformMatrix3fv': 411,
- 'UniformMatrix3fvImmediate': 412,
- 'UniformMatrix4fv': 413,
- 'UniformMatrix4fvImmediate': 414,
- 'UseProgram': 415,
- 'ValidateProgram': 416,
- 'VertexAttrib1f': 417,
- 'VertexAttrib1fv': 418,
- 'VertexAttrib1fvImmediate': 419,
- 'VertexAttrib2f': 420,
- 'VertexAttrib2fv': 421,
- 'VertexAttrib2fvImmediate': 422,
- 'VertexAttrib3f': 423,
- 'VertexAttrib3fv': 424,
- 'VertexAttrib3fvImmediate': 425,
- 'VertexAttrib4f': 426,
- 'VertexAttrib4fv': 427,
- 'VertexAttrib4fvImmediate': 428,
- 'VertexAttribPointer': 429,
- 'Viewport': 430,
- 'SwapBuffers': 431,
- 'BindAttribLocationBucket': 432,
- 'GetUniformLocationBucket': 433,
- 'GetAttribLocationBucket': 434,
- 'ShaderSourceBucket': 435,
- 'ShaderBinary': 436,
- 'ReleaseShaderCompiler': 437,
- 'GetMaxValueInBufferCHROMIUM': 438,
- 'GenSharedIdsCHROMIUM': 439,
- 'DeleteSharedIdsCHROMIUM': 440,
- 'RegisterSharedIdsCHROMIUM': 441,
- 'EnableFeatureCHROMIUM': 442,
- 'CompressedTexImage2DBucket': 443,
- 'CompressedTexSubImage2DBucket': 444,
- 'RenderbufferStorageMultisampleEXT': 445,
- 'BlitFramebufferEXT': 446,
- 'Placeholder447CHROMIUM': 447,
- 'ResizeCHROMIUM': 448,
- 'GetRequestableExtensionsCHROMIUM': 449,
- 'RequestExtensionCHROMIUM': 450,
- 'CreateStreamTextureCHROMIUM': 451,
- 'DestroyStreamTextureCHROMIUM': 452,
- 'Placeholder453CHROMIUM': 453,
- 'GetMultipleIntegervCHROMIUM': 454,
- 'GetProgramInfoCHROMIUM': 455,
- 'GetTranslatedShaderSourceANGLE': 456,
- 'PostSubBufferCHROMIUM': 457,
- 'TexImageIOSurface2DCHROMIUM': 458,
- 'TexStorage2DEXT': 459,
-}
-
# This is a list of enum names and their valid values. It is used to map
# GLenum arguments to a specific set of valid values.
_ENUM_LISTS = {
@@ -2140,32 +1928,6 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d,
offset += _SIZE_OF_UINT32
file.Write("\n")
- def WriteDocs(self, func, file):
- """Writes a structure for docs."""
- func.WriteCommandDescription(file)
- comment = func.GetInfo('cmd_comment')
- if not comment == None:
- file.Write(comment.replace('//', '//!'))
- file.Write("struct %s {\n" % func.name)
- file.Write(" static const CommandId kCmdId = %d;\n\n" %
- _CMD_ID_TABLE[func.name])
- result = func.GetInfo('result')
- if not result == None:
- if len(result) == 1:
- file.Write(" typedef %s Result;\n\n" % result[0])
- else:
- file.Write(" struct Result {\n")
- for line in result:
- file.Write(" %s;\n" % line)
- file.Write(" };\n\n")
-
- file.Write(" CommandHeader header;\n")
- args = func.GetCmdArgs()
- for arg in args:
- file.Write(" %s %s; //!< %s\n" % (arg.cmd_type, arg.name, arg.type))
- file.Write("};\n")
- file.Write("\n")
-
def WriteHandlerImplementation(self, func, file):
"""Writes the handler implementation for this command."""
file.Write(" %s(%s);\n" %
@@ -5879,17 +5641,11 @@ class GLGenerator(object):
"""Writes the command buffer format"""
file = CHeaderWriter(filename)
file.Write("#define GLES2_COMMAND_LIST(OP) \\\n")
- by_id = {}
+ id = 256
for func in self.functions:
- if True:
- #gen_cmd = func.GetInfo('gen_cmd')
- #if gen_cmd == True or gen_cmd == None:
- if not func.name in _CMD_ID_TABLE:
- self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
- by_id[_CMD_ID_TABLE[func.name]] = func
- for id in sorted(by_id.keys()):
file.Write(" %-60s /* %d */ \\\n" %
- ("OP(%s)" % by_id[id].name, id))
+ ("OP(%s)" % func.name, id))
+ id += 1
file.Write("\n")
file.Write("enum CommandId {\n")
@@ -5941,29 +5697,6 @@ class GLGenerator(object):
file.Close()
- def WriteCommandIdTest(self, filename):
- """Writes the command id test."""
- file = CHeaderWriter(
- filename,
- "// This file contains unit tests for gles2 commmand ids\n")
-
- file.Write("// *** These IDs MUST NOT CHANGE!!! ***\n")
- file.Write("// Changing them will break all client programs.\n")
- file.Write("TEST(GLES2CommandIdTest, CommandIdsMatch) {\n")
- for func in self.functions:
- if True:
- #gen_cmd = func.GetInfo('gen_cmd')
- #if gen_cmd == True or gen_cmd == None:
- if not func.name in _CMD_ID_TABLE:
- self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
- file.Write(" COMPILE_ASSERT(%s::kCmdId == %d,\n" %
- (func.name, _CMD_ID_TABLE[func.name]))
- file.Write(" GLES2_%s_kCmdId_mismatch);\n" % func.name)
-
- file.Write("}\n")
- file.Write("\n")
- file.Close()
-
def WriteCmdHelperHeader(self, filename):
"""Writes the gles2 command helper."""
file = CHeaderWriter(filename)
@@ -6340,12 +6073,6 @@ def main(argv):
"-g", "--generate-implementation-templates", action="store_true",
help="generates files that are generally hand edited..")
parser.add_option(
- "--generate-command-id-tests", action="store_true",
- help="generate tests for commands ids. Commands MUST not change ID!")
- parser.add_option(
- "--generate-docs", action="store_true",
- help="generate a docs friendly version of the command formats.")
- parser.add_option(
"--alternate-mode", type="choice",
choices=("ppapi", "chrome_ppapi", "chrome_ppapi_proxy", "nacl_ppapi"),
help="generate files for other projects. \"ppapi\" will generate ppapi "
@@ -6405,12 +6132,6 @@ def main(argv):
gen.WriteCommonUtilsHeader("common/gles2_cmd_utils_autogen.h")
gen.WriteCommonUtilsImpl("common/gles2_cmd_utils_implementation_autogen.h")
- if options.generate_command_id_tests:
- gen.WriteCommandIdTest("common/gles2_cmd_id_test_autogen.h")
-
- if options.generate_docs:
- gen.WriteDocs("docs/gles2_cmd_format_docs_autogen.h")
-
if gen.errors > 0:
print "%d errors" % gen.errors
return 1
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
index 07a2ae7..e8cf5f9 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/command_buffer/common/gles2_cmd_id_test.cc b/gpu/command_buffer/common/gles2_cmd_id_test.cc
deleted file mode 100644
index 5cdf61df..0000000
--- a/gpu/command_buffer/common/gles2_cmd_id_test.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.
-
-// This file contains unit tests for gles2 commmand ids
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "gpu/command_buffer/common/gles2_cmd_format.h"
-
-namespace gpu {
-namespace gles2 {
-
-#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
deleted file mode 100644
index 9597b12f..0000000
--- a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
+++ /dev/null
@@ -1,419 +0,0 @@
-// Copyright (c) 2011 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 unit tests for gles2 commmand ids
-#ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_ID_TEST_AUTOGEN_H_
-#define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_ID_TEST_AUTOGEN_H_
-
-// *** 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(BindAttribLocationBucket::kCmdId == 432,
- GLES2_BindAttribLocationBucket_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(CompressedTexImage2DBucket::kCmdId == 443,
- GLES2_CompressedTexImage2DBucket_kCmdId_mismatch);
- COMPILE_ASSERT(CompressedTexSubImage2D::kCmdId == 282,
- GLES2_CompressedTexSubImage2D_kCmdId_mismatch);
- COMPILE_ASSERT(CompressedTexSubImage2DImmediate::kCmdId == 283,
- GLES2_CompressedTexSubImage2DImmediate_kCmdId_mismatch);
- COMPILE_ASSERT(CompressedTexSubImage2DBucket::kCmdId == 444,
- GLES2_CompressedTexSubImage2DBucket_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(GetAttribLocationBucket::kCmdId == 434,
- GLES2_GetAttribLocationBucket_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(GetUniformLocationBucket::kCmdId == 433,
- GLES2_GetUniformLocationBucket_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(ReleaseShaderCompiler::kCmdId == 437,
- GLES2_ReleaseShaderCompiler_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(ShaderBinary::kCmdId == 436,
- GLES2_ShaderBinary_kCmdId_mismatch);
- COMPILE_ASSERT(ShaderSource::kCmdId == 367,
- GLES2_ShaderSource_kCmdId_mismatch);
- COMPILE_ASSERT(ShaderSourceImmediate::kCmdId == 368,
- GLES2_ShaderSourceImmediate_kCmdId_mismatch);
- COMPILE_ASSERT(ShaderSourceBucket::kCmdId == 435,
- GLES2_ShaderSourceBucket_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(BlitFramebufferEXT::kCmdId == 446,
- GLES2_BlitFramebufferEXT_kCmdId_mismatch);
- COMPILE_ASSERT(RenderbufferStorageMultisampleEXT::kCmdId == 445,
- GLES2_RenderbufferStorageMultisampleEXT_kCmdId_mismatch);
- COMPILE_ASSERT(SwapBuffers::kCmdId == 431,
- GLES2_SwapBuffers_kCmdId_mismatch);
- COMPILE_ASSERT(GetMaxValueInBufferCHROMIUM::kCmdId == 438,
- GLES2_GetMaxValueInBufferCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(GenSharedIdsCHROMIUM::kCmdId == 439,
- GLES2_GenSharedIdsCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(DeleteSharedIdsCHROMIUM::kCmdId == 440,
- GLES2_DeleteSharedIdsCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(RegisterSharedIdsCHROMIUM::kCmdId == 441,
- GLES2_RegisterSharedIdsCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(EnableFeatureCHROMIUM::kCmdId == 442,
- GLES2_EnableFeatureCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(ResizeCHROMIUM::kCmdId == 448,
- GLES2_ResizeCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(GetRequestableExtensionsCHROMIUM::kCmdId == 449,
- GLES2_GetRequestableExtensionsCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(RequestExtensionCHROMIUM::kCmdId == 450,
- GLES2_RequestExtensionCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(GetMultipleIntegervCHROMIUM::kCmdId == 454,
- GLES2_GetMultipleIntegervCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(GetProgramInfoCHROMIUM::kCmdId == 455,
- GLES2_GetProgramInfoCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(Placeholder447CHROMIUM::kCmdId == 447,
- GLES2_Placeholder447CHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(CreateStreamTextureCHROMIUM::kCmdId == 451,
- GLES2_CreateStreamTextureCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(DestroyStreamTextureCHROMIUM::kCmdId == 452,
- GLES2_DestroyStreamTextureCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(Placeholder453CHROMIUM::kCmdId == 453,
- GLES2_Placeholder453CHROMIUM_kCmdId_mismatch);
-}
-
-#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_ID_TEST_AUTOGEN_H_
-
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index e118b70..184ff8d 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -14,206 +14,206 @@
OP(AttachShader) /* 257 */ \
OP(BindAttribLocation) /* 258 */ \
OP(BindAttribLocationImmediate) /* 259 */ \
- OP(BindBuffer) /* 260 */ \
- OP(BindFramebuffer) /* 261 */ \
- OP(BindRenderbuffer) /* 262 */ \
- OP(BindTexture) /* 263 */ \
- OP(BlendColor) /* 264 */ \
- OP(BlendEquation) /* 265 */ \
- OP(BlendEquationSeparate) /* 266 */ \
- OP(BlendFunc) /* 267 */ \
- OP(BlendFuncSeparate) /* 268 */ \
- OP(BufferData) /* 269 */ \
- OP(BufferDataImmediate) /* 270 */ \
- OP(BufferSubData) /* 271 */ \
- OP(BufferSubDataImmediate) /* 272 */ \
- OP(CheckFramebufferStatus) /* 273 */ \
- OP(Clear) /* 274 */ \
- OP(ClearColor) /* 275 */ \
- OP(ClearDepthf) /* 276 */ \
- OP(ClearStencil) /* 277 */ \
- OP(ColorMask) /* 278 */ \
- OP(CompileShader) /* 279 */ \
- OP(CompressedTexImage2D) /* 280 */ \
- OP(CompressedTexImage2DImmediate) /* 281 */ \
- OP(CompressedTexSubImage2D) /* 282 */ \
- OP(CompressedTexSubImage2DImmediate) /* 283 */ \
- OP(CopyTexImage2D) /* 284 */ \
- OP(CopyTexSubImage2D) /* 285 */ \
- OP(CreateProgram) /* 286 */ \
- OP(CreateShader) /* 287 */ \
- OP(CullFace) /* 288 */ \
- OP(DeleteBuffers) /* 289 */ \
- OP(DeleteBuffersImmediate) /* 290 */ \
- OP(DeleteFramebuffers) /* 291 */ \
- OP(DeleteFramebuffersImmediate) /* 292 */ \
- OP(DeleteProgram) /* 293 */ \
- OP(DeleteRenderbuffers) /* 294 */ \
- OP(DeleteRenderbuffersImmediate) /* 295 */ \
- OP(DeleteShader) /* 296 */ \
- OP(DeleteTextures) /* 297 */ \
- OP(DeleteTexturesImmediate) /* 298 */ \
- OP(DepthFunc) /* 299 */ \
- OP(DepthMask) /* 300 */ \
- OP(DepthRangef) /* 301 */ \
- OP(DetachShader) /* 302 */ \
- OP(Disable) /* 303 */ \
- OP(DisableVertexAttribArray) /* 304 */ \
- OP(DrawArrays) /* 305 */ \
- OP(DrawElements) /* 306 */ \
- OP(Enable) /* 307 */ \
- OP(EnableVertexAttribArray) /* 308 */ \
- OP(Finish) /* 309 */ \
- OP(Flush) /* 310 */ \
- OP(FramebufferRenderbuffer) /* 311 */ \
- OP(FramebufferTexture2D) /* 312 */ \
- OP(FrontFace) /* 313 */ \
- OP(GenBuffers) /* 314 */ \
- OP(GenBuffersImmediate) /* 315 */ \
- OP(GenerateMipmap) /* 316 */ \
- OP(GenFramebuffers) /* 317 */ \
- OP(GenFramebuffersImmediate) /* 318 */ \
- OP(GenRenderbuffers) /* 319 */ \
- OP(GenRenderbuffersImmediate) /* 320 */ \
- OP(GenTextures) /* 321 */ \
- OP(GenTexturesImmediate) /* 322 */ \
- OP(GetActiveAttrib) /* 323 */ \
- OP(GetActiveUniform) /* 324 */ \
- OP(GetAttachedShaders) /* 325 */ \
- OP(GetAttribLocation) /* 326 */ \
- OP(GetAttribLocationImmediate) /* 327 */ \
- OP(GetBooleanv) /* 328 */ \
- OP(GetBufferParameteriv) /* 329 */ \
- OP(GetError) /* 330 */ \
- OP(GetFloatv) /* 331 */ \
- OP(GetFramebufferAttachmentParameteriv) /* 332 */ \
- OP(GetIntegerv) /* 333 */ \
- OP(GetProgramiv) /* 334 */ \
- OP(GetProgramInfoLog) /* 335 */ \
- OP(GetRenderbufferParameteriv) /* 336 */ \
- OP(GetShaderiv) /* 337 */ \
- OP(GetShaderInfoLog) /* 338 */ \
- OP(GetShaderPrecisionFormat) /* 339 */ \
- OP(GetShaderSource) /* 340 */ \
- OP(GetString) /* 341 */ \
- OP(GetTexParameterfv) /* 342 */ \
- OP(GetTexParameteriv) /* 343 */ \
- OP(GetUniformfv) /* 344 */ \
- OP(GetUniformiv) /* 345 */ \
- OP(GetUniformLocation) /* 346 */ \
- OP(GetUniformLocationImmediate) /* 347 */ \
- OP(GetVertexAttribfv) /* 348 */ \
- OP(GetVertexAttribiv) /* 349 */ \
- OP(GetVertexAttribPointerv) /* 350 */ \
- OP(Hint) /* 351 */ \
- OP(IsBuffer) /* 352 */ \
- OP(IsEnabled) /* 353 */ \
- OP(IsFramebuffer) /* 354 */ \
- OP(IsProgram) /* 355 */ \
- OP(IsRenderbuffer) /* 356 */ \
- OP(IsShader) /* 357 */ \
- OP(IsTexture) /* 358 */ \
- OP(LineWidth) /* 359 */ \
- OP(LinkProgram) /* 360 */ \
- OP(PixelStorei) /* 361 */ \
- OP(PolygonOffset) /* 362 */ \
- OP(ReadPixels) /* 363 */ \
- OP(RenderbufferStorage) /* 364 */ \
- OP(SampleCoverage) /* 365 */ \
- OP(Scissor) /* 366 */ \
- OP(ShaderSource) /* 367 */ \
- OP(ShaderSourceImmediate) /* 368 */ \
- OP(StencilFunc) /* 369 */ \
- OP(StencilFuncSeparate) /* 370 */ \
- OP(StencilMask) /* 371 */ \
- OP(StencilMaskSeparate) /* 372 */ \
- OP(StencilOp) /* 373 */ \
- OP(StencilOpSeparate) /* 374 */ \
- OP(TexImage2D) /* 375 */ \
- OP(TexImage2DImmediate) /* 376 */ \
- OP(TexParameterf) /* 377 */ \
- OP(TexParameterfv) /* 378 */ \
- OP(TexParameterfvImmediate) /* 379 */ \
- OP(TexParameteri) /* 380 */ \
- OP(TexParameteriv) /* 381 */ \
- OP(TexParameterivImmediate) /* 382 */ \
- OP(TexSubImage2D) /* 383 */ \
- OP(TexSubImage2DImmediate) /* 384 */ \
- OP(Uniform1f) /* 385 */ \
- OP(Uniform1fv) /* 386 */ \
- OP(Uniform1fvImmediate) /* 387 */ \
- OP(Uniform1i) /* 388 */ \
- OP(Uniform1iv) /* 389 */ \
- OP(Uniform1ivImmediate) /* 390 */ \
- OP(Uniform2f) /* 391 */ \
- OP(Uniform2fv) /* 392 */ \
- OP(Uniform2fvImmediate) /* 393 */ \
- OP(Uniform2i) /* 394 */ \
- OP(Uniform2iv) /* 395 */ \
- OP(Uniform2ivImmediate) /* 396 */ \
- OP(Uniform3f) /* 397 */ \
- OP(Uniform3fv) /* 398 */ \
- OP(Uniform3fvImmediate) /* 399 */ \
- OP(Uniform3i) /* 400 */ \
- OP(Uniform3iv) /* 401 */ \
- OP(Uniform3ivImmediate) /* 402 */ \
- OP(Uniform4f) /* 403 */ \
- OP(Uniform4fv) /* 404 */ \
- OP(Uniform4fvImmediate) /* 405 */ \
- OP(Uniform4i) /* 406 */ \
- OP(Uniform4iv) /* 407 */ \
- OP(Uniform4ivImmediate) /* 408 */ \
- OP(UniformMatrix2fv) /* 409 */ \
- OP(UniformMatrix2fvImmediate) /* 410 */ \
- OP(UniformMatrix3fv) /* 411 */ \
- OP(UniformMatrix3fvImmediate) /* 412 */ \
- OP(UniformMatrix4fv) /* 413 */ \
- OP(UniformMatrix4fvImmediate) /* 414 */ \
- OP(UseProgram) /* 415 */ \
- OP(ValidateProgram) /* 416 */ \
- OP(VertexAttrib1f) /* 417 */ \
- OP(VertexAttrib1fv) /* 418 */ \
- OP(VertexAttrib1fvImmediate) /* 419 */ \
- OP(VertexAttrib2f) /* 420 */ \
- OP(VertexAttrib2fv) /* 421 */ \
- OP(VertexAttrib2fvImmediate) /* 422 */ \
- OP(VertexAttrib3f) /* 423 */ \
- OP(VertexAttrib3fv) /* 424 */ \
- OP(VertexAttrib3fvImmediate) /* 425 */ \
- OP(VertexAttrib4f) /* 426 */ \
- OP(VertexAttrib4fv) /* 427 */ \
- OP(VertexAttrib4fvImmediate) /* 428 */ \
- OP(VertexAttribPointer) /* 429 */ \
- OP(Viewport) /* 430 */ \
- OP(SwapBuffers) /* 431 */ \
- OP(BindAttribLocationBucket) /* 432 */ \
- OP(GetUniformLocationBucket) /* 433 */ \
- OP(GetAttribLocationBucket) /* 434 */ \
- OP(ShaderSourceBucket) /* 435 */ \
- OP(ShaderBinary) /* 436 */ \
- OP(ReleaseShaderCompiler) /* 437 */ \
- OP(GetMaxValueInBufferCHROMIUM) /* 438 */ \
- OP(GenSharedIdsCHROMIUM) /* 439 */ \
- OP(DeleteSharedIdsCHROMIUM) /* 440 */ \
- OP(RegisterSharedIdsCHROMIUM) /* 441 */ \
- OP(EnableFeatureCHROMIUM) /* 442 */ \
- OP(CompressedTexImage2DBucket) /* 443 */ \
- OP(CompressedTexSubImage2DBucket) /* 444 */ \
- OP(RenderbufferStorageMultisampleEXT) /* 445 */ \
- OP(BlitFramebufferEXT) /* 446 */ \
- OP(Placeholder447CHROMIUM) /* 447 */ \
+ OP(BindAttribLocationBucket) /* 260 */ \
+ OP(BindBuffer) /* 261 */ \
+ OP(BindFramebuffer) /* 262 */ \
+ OP(BindRenderbuffer) /* 263 */ \
+ OP(BindTexture) /* 264 */ \
+ OP(BlendColor) /* 265 */ \
+ OP(BlendEquation) /* 266 */ \
+ OP(BlendEquationSeparate) /* 267 */ \
+ OP(BlendFunc) /* 268 */ \
+ OP(BlendFuncSeparate) /* 269 */ \
+ OP(BufferData) /* 270 */ \
+ OP(BufferDataImmediate) /* 271 */ \
+ OP(BufferSubData) /* 272 */ \
+ OP(BufferSubDataImmediate) /* 273 */ \
+ OP(CheckFramebufferStatus) /* 274 */ \
+ OP(Clear) /* 275 */ \
+ OP(ClearColor) /* 276 */ \
+ OP(ClearDepthf) /* 277 */ \
+ OP(ClearStencil) /* 278 */ \
+ OP(ColorMask) /* 279 */ \
+ OP(CompileShader) /* 280 */ \
+ OP(CompressedTexImage2D) /* 281 */ \
+ OP(CompressedTexImage2DImmediate) /* 282 */ \
+ OP(CompressedTexImage2DBucket) /* 283 */ \
+ OP(CompressedTexSubImage2D) /* 284 */ \
+ OP(CompressedTexSubImage2DImmediate) /* 285 */ \
+ OP(CompressedTexSubImage2DBucket) /* 286 */ \
+ OP(CopyTexImage2D) /* 287 */ \
+ OP(CopyTexSubImage2D) /* 288 */ \
+ OP(CreateProgram) /* 289 */ \
+ OP(CreateShader) /* 290 */ \
+ OP(CullFace) /* 291 */ \
+ OP(DeleteBuffers) /* 292 */ \
+ OP(DeleteBuffersImmediate) /* 293 */ \
+ OP(DeleteFramebuffers) /* 294 */ \
+ OP(DeleteFramebuffersImmediate) /* 295 */ \
+ OP(DeleteProgram) /* 296 */ \
+ OP(DeleteRenderbuffers) /* 297 */ \
+ OP(DeleteRenderbuffersImmediate) /* 298 */ \
+ OP(DeleteShader) /* 299 */ \
+ OP(DeleteTextures) /* 300 */ \
+ OP(DeleteTexturesImmediate) /* 301 */ \
+ OP(DepthFunc) /* 302 */ \
+ OP(DepthMask) /* 303 */ \
+ OP(DepthRangef) /* 304 */ \
+ OP(DetachShader) /* 305 */ \
+ OP(Disable) /* 306 */ \
+ OP(DisableVertexAttribArray) /* 307 */ \
+ OP(DrawArrays) /* 308 */ \
+ OP(DrawElements) /* 309 */ \
+ OP(Enable) /* 310 */ \
+ OP(EnableVertexAttribArray) /* 311 */ \
+ OP(Finish) /* 312 */ \
+ OP(Flush) /* 313 */ \
+ OP(FramebufferRenderbuffer) /* 314 */ \
+ OP(FramebufferTexture2D) /* 315 */ \
+ OP(FrontFace) /* 316 */ \
+ OP(GenBuffers) /* 317 */ \
+ OP(GenBuffersImmediate) /* 318 */ \
+ OP(GenerateMipmap) /* 319 */ \
+ OP(GenFramebuffers) /* 320 */ \
+ OP(GenFramebuffersImmediate) /* 321 */ \
+ OP(GenRenderbuffers) /* 322 */ \
+ OP(GenRenderbuffersImmediate) /* 323 */ \
+ OP(GenTextures) /* 324 */ \
+ OP(GenTexturesImmediate) /* 325 */ \
+ OP(GetActiveAttrib) /* 326 */ \
+ OP(GetActiveUniform) /* 327 */ \
+ OP(GetAttachedShaders) /* 328 */ \
+ OP(GetAttribLocation) /* 329 */ \
+ OP(GetAttribLocationImmediate) /* 330 */ \
+ OP(GetAttribLocationBucket) /* 331 */ \
+ OP(GetBooleanv) /* 332 */ \
+ OP(GetBufferParameteriv) /* 333 */ \
+ OP(GetError) /* 334 */ \
+ OP(GetFloatv) /* 335 */ \
+ OP(GetFramebufferAttachmentParameteriv) /* 336 */ \
+ OP(GetIntegerv) /* 337 */ \
+ OP(GetProgramiv) /* 338 */ \
+ OP(GetProgramInfoLog) /* 339 */ \
+ OP(GetRenderbufferParameteriv) /* 340 */ \
+ OP(GetShaderiv) /* 341 */ \
+ OP(GetShaderInfoLog) /* 342 */ \
+ OP(GetShaderPrecisionFormat) /* 343 */ \
+ OP(GetShaderSource) /* 344 */ \
+ OP(GetString) /* 345 */ \
+ OP(GetTexParameterfv) /* 346 */ \
+ OP(GetTexParameteriv) /* 347 */ \
+ OP(GetUniformfv) /* 348 */ \
+ OP(GetUniformiv) /* 349 */ \
+ OP(GetUniformLocation) /* 350 */ \
+ OP(GetUniformLocationImmediate) /* 351 */ \
+ OP(GetUniformLocationBucket) /* 352 */ \
+ OP(GetVertexAttribfv) /* 353 */ \
+ OP(GetVertexAttribiv) /* 354 */ \
+ OP(GetVertexAttribPointerv) /* 355 */ \
+ OP(Hint) /* 356 */ \
+ OP(IsBuffer) /* 357 */ \
+ OP(IsEnabled) /* 358 */ \
+ OP(IsFramebuffer) /* 359 */ \
+ OP(IsProgram) /* 360 */ \
+ OP(IsRenderbuffer) /* 361 */ \
+ OP(IsShader) /* 362 */ \
+ OP(IsTexture) /* 363 */ \
+ OP(LineWidth) /* 364 */ \
+ OP(LinkProgram) /* 365 */ \
+ OP(PixelStorei) /* 366 */ \
+ OP(PolygonOffset) /* 367 */ \
+ OP(ReadPixels) /* 368 */ \
+ OP(ReleaseShaderCompiler) /* 369 */ \
+ OP(RenderbufferStorage) /* 370 */ \
+ OP(SampleCoverage) /* 371 */ \
+ OP(Scissor) /* 372 */ \
+ OP(ShaderBinary) /* 373 */ \
+ OP(ShaderSource) /* 374 */ \
+ OP(ShaderSourceImmediate) /* 375 */ \
+ OP(ShaderSourceBucket) /* 376 */ \
+ OP(StencilFunc) /* 377 */ \
+ OP(StencilFuncSeparate) /* 378 */ \
+ OP(StencilMask) /* 379 */ \
+ OP(StencilMaskSeparate) /* 380 */ \
+ OP(StencilOp) /* 381 */ \
+ OP(StencilOpSeparate) /* 382 */ \
+ OP(TexImage2D) /* 383 */ \
+ OP(TexImage2DImmediate) /* 384 */ \
+ OP(TexParameterf) /* 385 */ \
+ OP(TexParameterfv) /* 386 */ \
+ OP(TexParameterfvImmediate) /* 387 */ \
+ OP(TexParameteri) /* 388 */ \
+ OP(TexParameteriv) /* 389 */ \
+ OP(TexParameterivImmediate) /* 390 */ \
+ OP(TexSubImage2D) /* 391 */ \
+ OP(TexSubImage2DImmediate) /* 392 */ \
+ OP(Uniform1f) /* 393 */ \
+ OP(Uniform1fv) /* 394 */ \
+ OP(Uniform1fvImmediate) /* 395 */ \
+ OP(Uniform1i) /* 396 */ \
+ OP(Uniform1iv) /* 397 */ \
+ OP(Uniform1ivImmediate) /* 398 */ \
+ OP(Uniform2f) /* 399 */ \
+ OP(Uniform2fv) /* 400 */ \
+ OP(Uniform2fvImmediate) /* 401 */ \
+ OP(Uniform2i) /* 402 */ \
+ OP(Uniform2iv) /* 403 */ \
+ OP(Uniform2ivImmediate) /* 404 */ \
+ OP(Uniform3f) /* 405 */ \
+ OP(Uniform3fv) /* 406 */ \
+ OP(Uniform3fvImmediate) /* 407 */ \
+ OP(Uniform3i) /* 408 */ \
+ OP(Uniform3iv) /* 409 */ \
+ OP(Uniform3ivImmediate) /* 410 */ \
+ OP(Uniform4f) /* 411 */ \
+ OP(Uniform4fv) /* 412 */ \
+ OP(Uniform4fvImmediate) /* 413 */ \
+ OP(Uniform4i) /* 414 */ \
+ OP(Uniform4iv) /* 415 */ \
+ OP(Uniform4ivImmediate) /* 416 */ \
+ OP(UniformMatrix2fv) /* 417 */ \
+ OP(UniformMatrix2fvImmediate) /* 418 */ \
+ OP(UniformMatrix3fv) /* 419 */ \
+ OP(UniformMatrix3fvImmediate) /* 420 */ \
+ OP(UniformMatrix4fv) /* 421 */ \
+ OP(UniformMatrix4fvImmediate) /* 422 */ \
+ OP(UseProgram) /* 423 */ \
+ OP(ValidateProgram) /* 424 */ \
+ OP(VertexAttrib1f) /* 425 */ \
+ OP(VertexAttrib1fv) /* 426 */ \
+ OP(VertexAttrib1fvImmediate) /* 427 */ \
+ OP(VertexAttrib2f) /* 428 */ \
+ OP(VertexAttrib2fv) /* 429 */ \
+ OP(VertexAttrib2fvImmediate) /* 430 */ \
+ OP(VertexAttrib3f) /* 431 */ \
+ OP(VertexAttrib3fv) /* 432 */ \
+ OP(VertexAttrib3fvImmediate) /* 433 */ \
+ OP(VertexAttrib4f) /* 434 */ \
+ OP(VertexAttrib4fv) /* 435 */ \
+ OP(VertexAttrib4fvImmediate) /* 436 */ \
+ OP(VertexAttribPointer) /* 437 */ \
+ OP(Viewport) /* 438 */ \
+ OP(BlitFramebufferEXT) /* 439 */ \
+ OP(RenderbufferStorageMultisampleEXT) /* 440 */ \
+ OP(TexStorage2DEXT) /* 441 */ \
+ OP(SwapBuffers) /* 442 */ \
+ OP(GetMaxValueInBufferCHROMIUM) /* 443 */ \
+ OP(GenSharedIdsCHROMIUM) /* 444 */ \
+ OP(DeleteSharedIdsCHROMIUM) /* 445 */ \
+ OP(RegisterSharedIdsCHROMIUM) /* 446 */ \
+ OP(EnableFeatureCHROMIUM) /* 447 */ \
OP(ResizeCHROMIUM) /* 448 */ \
OP(GetRequestableExtensionsCHROMIUM) /* 449 */ \
OP(RequestExtensionCHROMIUM) /* 450 */ \
- OP(CreateStreamTextureCHROMIUM) /* 451 */ \
- OP(DestroyStreamTextureCHROMIUM) /* 452 */ \
- OP(Placeholder453CHROMIUM) /* 453 */ \
- OP(GetMultipleIntegervCHROMIUM) /* 454 */ \
- OP(GetProgramInfoCHROMIUM) /* 455 */ \
- OP(GetTranslatedShaderSourceANGLE) /* 456 */ \
- OP(PostSubBufferCHROMIUM) /* 457 */ \
- OP(TexImageIOSurface2DCHROMIUM) /* 458 */ \
- OP(TexStorage2DEXT) /* 459 */ \
+ OP(GetMultipleIntegervCHROMIUM) /* 451 */ \
+ OP(GetProgramInfoCHROMIUM) /* 452 */ \
+ OP(Placeholder447CHROMIUM) /* 453 */ \
+ OP(CreateStreamTextureCHROMIUM) /* 454 */ \
+ OP(DestroyStreamTextureCHROMIUM) /* 455 */ \
+ OP(Placeholder453CHROMIUM) /* 456 */ \
+ OP(GetTranslatedShaderSourceANGLE) /* 457 */ \
+ OP(PostSubBufferCHROMIUM) /* 458 */ \
+ OP(TexImageIOSurface2DCHROMIUM) /* 459 */ \
enum CommandId {
kStartPoint = cmd::kLastCommonId, // All GLES2 commands start after this.
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
index 70fb34b..e59d000 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index 1ce0b87..2a660eb 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -205,7 +205,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x00000400, "GL_STENCIL_BUFFER_BIT", },
{ 0x800A, "GL_FUNC_SUBTRACT", },
{ 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", },
- { 0x8508, "GL_DECR_WRAP", },
+ { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
{ 0x8006, "GL_FUNC_ADD", },
{ 0x8007, "GL_MIN_EXT", },
{ 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", },
@@ -465,7 +465,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x8CE4, "GL_COLOR_ATTACHMENT4_NV", },
{ 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", },
{ 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", },
- { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
+ { 0x8508, "GL_DECR_WRAP", },
{ 0x8507, "GL_INCR_WRAP", },
{ 0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING", },
{ 0x8894, "GL_ARRAY_BUFFER_BINDING", },
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
index 882ef3c..d85c69d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
index 518a588..0a694a3 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/command_buffer/service/gles2_cmd_validation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_autogen.h
index 7e4fafc..250fbbd 100644
--- a/gpu/command_buffer/service/gles2_cmd_validation_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_validation_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
index d89459c..d78cfde 100644
--- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index bc2395d..f9f945b 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -313,8 +313,6 @@
'command_buffer/common/command_buffer_mock.h',
'command_buffer/common/gles2_cmd_format_test.cc',
'command_buffer/common/gles2_cmd_format_test_autogen.h',
- 'command_buffer/common/gles2_cmd_id_test.cc',
- 'command_buffer/common/gles2_cmd_id_test_autogen.h',
'command_buffer/common/gles2_cmd_utils_unittest.cc',
'command_buffer/common/id_allocator_test.cc',
'command_buffer/common/trace_event.h',