TBR=apatrick@chromium.org

TEST=none
BUG=none

NOTE: This CL was already reviewed.
See: http://codereview.chromium.org/437044/show

Add ids and stubs for new common commands
and change it so command ids are 11 bits
and the size is 21 bits.

Since size is in command elements and
1 command element is 4 bytes that allows you
to pass 2^23rd bytes inside the command
buffer which is 8meg.


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

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

6 files changed, 848 insertions, 374 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 0d9a7e8..5c26709 100644
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -14,7 +14,7 @@ from optparse import OptionParser
 
 _SIZE_OF_UINT32 = 4
 _SIZE_OF_COMMAND_HEADER = 4
-_FIRST_SPECIFIC_COMMAND_ID = 1024
+_FIRST_SPECIFIC_COMMAND_ID = 256
 
 _LICENSE = """
 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
@@ -2553,7 +2553,7 @@ class GLGenerator(object):
     file.Write("// *** These IDs MUST NOT CHANGE!!! ***\n")
     file.Write("// Changing them will break all client programs.\n")
     file.Write("TEST(GLES2CommandIdTest, CommandIdsMatch) {\n")
-    command_id = 1024
+    command_id = _FIRST_SPECIFIC_COMMAND_ID
     for func in self.functions:
       file.Write("  COMPILE_ASSERT(%s::kCmdId == %d,\n" %
                  (func.name, command_id))
diff --git a/gpu/command_buffer/common/cmd_buffer_common.h b/gpu/command_buffer/common/cmd_buffer_common.h
index b17b135..3ace76d 100644
--- a/gpu/command_buffer/common/cmd_buffer_common.h
+++ b/gpu/command_buffer/common/cmd_buffer_common.h
@@ -63,11 +63,11 @@ inline size_t RoundSizeToMultipleOfEntries(size_t size_in_bytes) {
 
 // Struct that defines the command header in the command buffer.
 struct CommandHeader {
-  Uint32 size:8;
-  Uint32 command:24;
+  Uint32 size:21;
+  Uint32 command:11;
 
   void Init(uint32 _command, uint32 _size) {
-    DCHECK_LT(_size, 256u);
+    DCHECK_LE(_size, 1u << 22);
     command = _command;
     size = _size;
   }
@@ -161,22 +161,6 @@ void* NextImmediateCmdAddressTotalSize(void* cmd, uint32 total_size_in_bytes) {
       RoundSizeToMultipleOfEntries(total_size_in_bytes);
 }
 
-struct SharedMemory {
-  void Init(uint32 _id, uint32 _offset) {
-    id = _id;
-    offset = _offset;
-  }
-
-  uint32 id;
-  uint32 offset;
-};
-
-COMPILE_ASSERT(offsetof(SharedMemory, id) == 0,
-               Offsetof_SharedMemory_id_not_0);
-COMPILE_ASSERT(offsetof(SharedMemory, offset) == 4,
-               Offsetof_SharedMemory_offset_not_4);
-
-
 namespace cmd {
 
 // This macro is used to safely and convienently expand the list of commnad
@@ -189,6 +173,16 @@ namespace cmd {
 #define COMMON_COMMAND_BUFFER_CMDS(OP) \
   OP(Noop)                          /*  0 */ \
   OP(SetToken)                      /*  1 */ \
+  OP(Jump)                          /*  2 */ \
+  OP(JumpRelative)                  /*  3 */ \
+  OP(Call)                          /*  4 */ \
+  OP(CallRelative)                  /*  5 */ \
+  OP(Return)                        /*  6 */ \
+  OP(SetBucketSize)                 /*  7 */ \
+  OP(SetBucketData)                 /*  8 */ \
+  OP(SetBucketDataImmediate)        /*  9 */ \
+  OP(GetResultSize)                 /* 10 */ \
+  OP(GetResultData)                 /* 11 */ \
 
 // Common commands.
 enum CommandId {
@@ -199,13 +193,14 @@ enum CommandId {
   #undef COMMON_COMMAND_BUFFER_CMD_OP
 
   kNumCommands,
-  kLastCommonId = 1023,  // reserve 1024 spaces for common commands.
+  kLastCommonId = 255,  // reserve 256 spaces for common commands.
 };
 
 COMPILE_ASSERT(kNumCommands - 1 <= kLastCommonId, Too_many_common_commands);
 
 const char* GetCommandName(CommandId id);
 
+// A Noop command.
 struct Noop {
   typedef Noop ValueType;
   static const CommandId kCmdId = kNoop;
@@ -231,6 +226,8 @@ struct Noop {
 COMPILE_ASSERT(sizeof(Noop) == 4, Sizeof_Noop_is_not_4);
 COMPILE_ASSERT(offsetof(Noop, header) == 0, Offsetof_Noop_header_not_0);
 
+// The SetToken command puts a token in the command stream that you can
+// use to check if that token has been passed in the command stream.
 struct SetToken {
   typedef SetToken ValueType;
   static const CommandId kCmdId = kSetToken;
@@ -259,6 +256,412 @@ COMPILE_ASSERT(offsetof(SetToken, header) == 0,
 COMPILE_ASSERT(offsetof(SetToken, token) == 4,
                Offsetof_SetToken_token_not_4);
 
+// The Jump command jumps to another place in the command buffer.
+struct Jump {
+  typedef Jump ValueType;
+  static const CommandId kCmdId = kJump;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+    SetHeader();
+    shared_memory_id = _shared_memory_id;
+    shared_memory_offset = _shared_memory_offset;
+  }
+  static void* Set(
+      void* cmd, uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+    static_cast<ValueType*>(cmd)->Init(
+        _shared_memory_id, _shared_memory_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  uint32 shared_memory_id;
+  uint32 shared_memory_offset;
+};
+
+COMPILE_ASSERT(sizeof(Jump) == 12, Sizeof_Jump_is_not_12);
+COMPILE_ASSERT(offsetof(Jump, header) == 0,
+               Offsetof_Jump_header_not_0);
+COMPILE_ASSERT(offsetof(Jump, shared_memory_id) == 4,
+               Offsetof_Jump_shared_memory_id_not_4);
+COMPILE_ASSERT(offsetof(Jump, shared_memory_offset) == 8,
+               Offsetof_Jump_shared_memory_offset_not_8);
+
+// The JumpRelative command jumps to another place in the command buffer
+// relative to the end of this command. In other words. JumpRelative with an
+// offset of zero is effectively a noop.
+struct JumpRelative {
+  typedef JumpRelative ValueType;
+  static const CommandId kCmdId = kJumpRelative;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(int32 _offset) {
+    SetHeader();
+    offset = _offset;
+  }
+  static void* Set(void* cmd, int32 _offset) {
+    static_cast<ValueType*>(cmd)->Init(_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  int32 offset;
+};
+
+COMPILE_ASSERT(sizeof(JumpRelative) == 8, Sizeof_JumpRelative_is_not_8);
+COMPILE_ASSERT(offsetof(JumpRelative, header) == 0,
+               Offsetof_JumpRelative_header_not_0);
+COMPILE_ASSERT(offsetof(JumpRelative, offset) == 4,
+               Offsetof_JumpRelative_offset_4);
+
+// The Call command jumps to a subroutine which can be returned from with the
+// Return command.
+struct Call {
+  typedef Call ValueType;
+  static const CommandId kCmdId = kCall;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+    SetHeader();
+    shared_memory_id = _shared_memory_id;
+    shared_memory_offset = _shared_memory_offset;
+  }
+  static void* Set(
+      void* cmd, uint32 _shared_memory_id, uint32 _shared_memory_offset) {
+    static_cast<ValueType*>(cmd)->Init(
+        _shared_memory_id, _shared_memory_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  uint32 shared_memory_id;
+  uint32 shared_memory_offset;
+};
+
+COMPILE_ASSERT(sizeof(Call) == 12, Sizeof_Call_is_not_12);
+COMPILE_ASSERT(offsetof(Call, header) == 0,
+               Offsetof_Call_header_not_0);
+COMPILE_ASSERT(offsetof(Call, shared_memory_id) == 4,
+               Offsetof_Call_shared_memory_id_not_4);
+COMPILE_ASSERT(offsetof(Call, shared_memory_offset) == 8,
+               Offsetof_Call_shared_memory_offset_not_8);
+
+// The CallRelative command jumps to a subroutine using a relative offset. The
+// offset is relative to the end of this command..
+struct CallRelative {
+  typedef CallRelative ValueType;
+  static const CommandId kCmdId = kCallRelative;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(int32 _offset) {
+    SetHeader();
+    offset = _offset;
+  }
+  static void* Set(void* cmd, int32 _offset) {
+    static_cast<ValueType*>(cmd)->Init(_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  int32 offset;
+};
+
+COMPILE_ASSERT(sizeof(CallRelative) == 8, Sizeof_CallRelative_is_not_8);
+COMPILE_ASSERT(offsetof(CallRelative, header) == 0,
+               Offsetof_CallRelative_header_not_0);
+COMPILE_ASSERT(offsetof(CallRelative, offset) == 4,
+               Offsetof_CallRelative_offset_4);
+
+// Returns from a subroutine called by the Call or CallRelative commands.
+struct Return {
+  typedef Return ValueType;
+  static const CommandId kCmdId = kReturn;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init() {
+    SetHeader();
+  }
+  static void* Set(void* cmd) {
+    static_cast<ValueType*>(cmd)->Init();
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+};
+
+COMPILE_ASSERT(sizeof(Return) == 4, Sizeof_Return_is_not_4);
+COMPILE_ASSERT(offsetof(Return, header) == 0,
+               Offsetof_Return_header_not_0);
+
+// Sets the size of a bucket for collecting data on the service side.
+// This is a utility for gathering data on the service side so it can be used
+// all at once when some service side API is called. It removes the need to add
+// special commands just to support a particular API. For example, any API
+// command that needs a string needs a way to send that string to the API over
+// the command buffers. While you can require that the command buffer or
+// transfer buffer be large enough to hold the largest string you can send,
+// using this command removes that restriction by letting you send smaller
+// pieces over and build up the data on the service side.
+//
+// You can clear a bucket on the service side and thereby free memory by sending
+// a size of 0.
+struct SetBucketSize {
+  typedef SetBucketSize ValueType;
+  static const CommandId kCmdId = kSetBucketSize;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _bucket_id, uint32 _size) {
+    SetHeader();
+    bucket_id = _bucket_id;
+    size = _size;
+  }
+  static void* Set(void* cmd, uint32 _bucket_id, uint32 _size) {
+    static_cast<ValueType*>(cmd)->Init(_bucket_id, _size);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  utin32 bucket_id;
+  uint32 size;
+};
+
+COMPILE_ASSERT(sizeof(SetBucketSize) == 12, Sizeof_SetBucketSize_is_not_8);
+COMPILE_ASSERT(offsetof(SetBucketSize, header) == 0,
+               Offsetof_SetBucketSize_header_not_0);
+COMPILE_ASSERT(offsetof(SetBucketSize, bucket_id) == 4,
+               Offsetof_SetBucketSize_bucket_id_4);
+COMPILE_ASSERT(offsetof(SetBucketSize, size) == 8,
+               Offsetof_SetBucketSize_size_8);
+
+// Sets the contents of a portion of a bucket on the service side from data in
+// shared memory.
+// See SetBucketSize.
+struct SetBucketData {
+  typedef SetBucketData ValueType;
+  static const CommandId kCmdId = kSetBucketData;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _bucket_id,
+            uint32 _offset,
+            uint32 _size,
+            uint32 _shared_memory_id,
+            uint32 _shared_memory_offset) {
+    SetHeader();
+    bucket_id = _bucket_id;
+    offset = _offset;
+    size = _size;
+    shared_memory_id = _shared_memory_id;
+    shared_memory_offset = _shared_memory_offset;
+  }
+  static void* Set(void* cmd,
+                   uint32 _bucket_id,
+                   uint32 _offset,
+                   uint32 _size,
+                   uint32 _shared_memory_id,
+                   uint32 _shared_memory_offset) {
+    static_cast<ValueType*>(cmd)->Init(
+        _bucket_id,
+        _offset,
+        _size,
+        _shared_memory_id,
+        _shared_memory_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  uint32 bucket_id;
+  uint32 offset;
+  uint32 size;
+  uint32 shared_memory_id;
+  uint32 shared_memory_offset;
+};
+
+COMPILE_ASSERT(sizeof(SetBucketData) == 24, Sizeof_SetBucketData_is_not_24);
+COMPILE_ASSERT(offsetof(SetBucketData, header) == 0,
+               Offsetof_SetBucketData_header_not_0);
+COMPILE_ASSERT(offsetof(SetBucketData, bucket_id) == 4,
+               Offsetof_SetBucketData_bucket_id_not_4);
+COMPILE_ASSERT(offsetof(SetBucketData, offset) == 8,
+               Offsetof_SetBucketData_offset_not_8);
+COMPILE_ASSERT(offsetof(SetBucketData, size) == 12,
+               Offsetof_SetBucketData_size_not_12);
+COMPILE_ASSERT(offsetof(SetBucketData, shared_memory_id) == 16,
+               Offsetof_SetBucketData_shared_memory_id_not_16);
+COMPILE_ASSERT(offsetof(SetBucketData, shared_memory_offset) == 20,
+               Offsetof_SetBucketData_shared_memory_offset_not_20);
+
+// Sets the contents of a portion of a bucket on the service side from data in
+// the command buffer.
+// See SetBucketSize.
+struct SetBucketDataImmediate {
+  typedef SetBucketDataImmediate ValueType;
+  static const CommandId kCmdId = kSetBucketDataImmediate;
+  static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
+
+  void SetHeader(uint32 size) {
+    header.SetCmdBySize<ValueType>(size);
+  }
+
+  void Init(uint32 _bucket_id,
+            uint32 _offset,
+            uint32 _size) {
+    SetHeader(_size);
+    bucket_id = _bucket_id;
+    offset = _offset;
+    size = _size;
+  }
+  static void* Set(void* cmd,
+                   uint32 _bucket_id,
+                   uint32 _offset,
+                   uint32 _size) {
+    static_cast<ValueType*>(cmd)->Init(
+        _bucket_id,
+        _offset,
+        _size);
+    return NextImmediateCmdAddress<ValueType>(cmd, _size);
+  }
+
+  CommandHeader header;
+  uint32 bucket_id;
+  uint32 offset;
+  uint32 size;
+};
+
+COMPILE_ASSERT(sizeof(SetBucketDataImmediate) == 16,
+               Sizeof_SetBucketDataImmediate_is_not_24);
+COMPILE_ASSERT(offsetof(SetBucketDataImmediate, header) == 0,
+               Offsetof_SetBucketDataImmediate_header_not_0);
+COMPILE_ASSERT(offsetof(SetBucketDataImmediate, bucket_id) == 4,
+               Offsetof_SetBucketDataImmediate_bucket_id_not_4);
+COMPILE_ASSERT(offsetof(SetBucketDataImmediate, offset) == 8,
+               Offsetof_SetBucketDataImmediate_offset_not_8);
+COMPILE_ASSERT(offsetof(SetBucketDataImmediate, size) == 12,
+               Offsetof_SetBucketDataImmediate_size_not_12);
+
+// Gets the size of a result the service has available.
+// Sending a variable size result back to the client, for example any API that
+// returns a string, is problematic since the largest thing you can send back is
+// the size of your shared memory. This command along with GetResultData
+// implement a way to get a result a piece at a time to help solve that problem
+// in a generic way.
+struct GetResultSize {
+  typedef GetResultSize ValueType;
+  static const CommandId kCmdId = kGetResultSize;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _shared_memory_id,
+            uint32 _shared_memory_offset) {
+    SetHeader();
+    shared_memory_id = _shared_memory_id;
+    shared_memory_offset = _shared_memory_offset;
+  }
+  static void* Set(void* cmd,
+                   uint32 _shared_memory_id,
+                   uint32 _shared_memory_offset) {
+    static_cast<ValueType*>(cmd)->Init(
+        _shared_memory_id,
+        _shared_memory_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  uint32 shared_memory_id;
+  uint32 shared_memory_offset;
+};
+
+COMPILE_ASSERT(sizeof(GetResultSize) == 12, Sizeof_GetResultSize_is_not_12);
+COMPILE_ASSERT(offsetof(GetResultSize, header) == 0,
+               Offsetof_GetResultSize_header_not_0);
+COMPILE_ASSERT(offsetof(GetResultSize, shared_memory_id) == 4,
+               Offsetof_GetResultSize_shared_memory_id_not_4);
+COMPILE_ASSERT(offsetof(GetResultSize, shared_memory_offset) == 8,
+               Offsetof_GetResultSize_shared_memory_offset_not_8);
+
+// Gets a piece of a result the service as available.
+// See GetResultSize.
+struct GetResultData {
+  typedef GetResultData ValueType;
+  static const CommandId kCmdId = kGetResultData;
+  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+  void SetHeader() {
+    header.SetCmd<ValueType>();
+  }
+
+  void Init(uint32 _offset,
+            uint32 _size,
+            uint32 _shared_memory_id,
+            uint32 _shared_memory_offset) {
+    SetHeader();
+    offset = _offset;
+    size = _size;
+    shared_memory_id = _shared_memory_id;
+    shared_memory_offset = _shared_memory_offset;
+  }
+  static void* Set(void* cmd,
+                   uint32 _offset,
+                   uint32 _size,
+                   uint32 _shared_memory_id,
+                   uint32 _shared_memory_offset) {
+    static_cast<ValueType*>(cmd)->Init(
+        _offset,
+        _size,
+        _shared_memory_id,
+        _shared_memory_offset);
+    return NextCmdAddress<ValueType>(cmd);
+  }
+
+  CommandHeader header;
+  uint32 offset;
+  uint32 size;
+  uint32 shared_memory_id;
+  uint32 shared_memory_offset;
+};
+
+COMPILE_ASSERT(sizeof(GetResultData) == 20, Sizeof_GetResultData_is_not_20);
+COMPILE_ASSERT(offsetof(GetResultData, header) == 0,
+               Offsetof_GetResultData_header_not_0);
+COMPILE_ASSERT(offsetof(GetResultData, offset) == 4,
+               Offsetof_GetResultData_offset_not_4);
+COMPILE_ASSERT(offsetof(GetResultData, size) == 8,
+               Offsetof_GetResultData_size_not_8);
+COMPILE_ASSERT(offsetof(GetResultData, shared_memory_id) == 12,
+               Offsetof_GetResultData_shared_memory_id_not_12);
+COMPILE_ASSERT(offsetof(GetResultData, shared_memory_offset) == 16,
+               Offsetof_GetResultData_shared_memory_offset_not_16);
+
 }  // namespace cmd
 
 #pragma pack(pop)
diff --git a/gpu/command_buffer/common/gles2_cmd_id_test.cc b/gpu/command_buffer/common/gles2_cmd_id_test.cc
index 4094cfb..05035f9 100644
--- a/gpu/command_buffer/common/gles2_cmd_id_test.cc
+++ b/gpu/command_buffer/common/gles2_cmd_id_test.cc
@@ -14,357 +14,357 @@ namespace gles2 {
 // *** These IDs MUST NOT CHANGE!!! ***
 // Changing them will break all client programs.
 TEST(GLES2CommandIdTest, CommandIdsMatch) {
-  COMPILE_ASSERT(ActiveTexture::kCmdId == 1024,
+  COMPILE_ASSERT(ActiveTexture::kCmdId == 256,
                  GLES2_ActiveTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(AttachShader::kCmdId == 1025,
+  COMPILE_ASSERT(AttachShader::kCmdId == 257,
                  GLES2_AttachShader_kCmdId_mismatch);
-  COMPILE_ASSERT(BindAttribLocation::kCmdId == 1026,
+  COMPILE_ASSERT(BindAttribLocation::kCmdId == 258,
                  GLES2_BindAttribLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(BindAttribLocationImmediate::kCmdId == 1027,
+  COMPILE_ASSERT(BindAttribLocationImmediate::kCmdId == 259,
                  GLES2_BindAttribLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(BindBuffer::kCmdId == 1028,
+  COMPILE_ASSERT(BindBuffer::kCmdId == 260,
                  GLES2_BindBuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindFramebuffer::kCmdId == 1029,
+  COMPILE_ASSERT(BindFramebuffer::kCmdId == 261,
                  GLES2_BindFramebuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindRenderbuffer::kCmdId == 1030,
+  COMPILE_ASSERT(BindRenderbuffer::kCmdId == 262,
                  GLES2_BindRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(BindTexture::kCmdId == 1031,
+  COMPILE_ASSERT(BindTexture::kCmdId == 263,
                  GLES2_BindTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendColor::kCmdId == 1032,
+  COMPILE_ASSERT(BlendColor::kCmdId == 264,
                  GLES2_BlendColor_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendEquation::kCmdId == 1033,
+  COMPILE_ASSERT(BlendEquation::kCmdId == 265,
                  GLES2_BlendEquation_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendEquationSeparate::kCmdId == 1034,
+  COMPILE_ASSERT(BlendEquationSeparate::kCmdId == 266,
                  GLES2_BlendEquationSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendFunc::kCmdId == 1035,
+  COMPILE_ASSERT(BlendFunc::kCmdId == 267,
                  GLES2_BlendFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(BlendFuncSeparate::kCmdId == 1036,
+  COMPILE_ASSERT(BlendFuncSeparate::kCmdId == 268,
                  GLES2_BlendFuncSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferData::kCmdId == 1037,
+  COMPILE_ASSERT(BufferData::kCmdId == 269,
                  GLES2_BufferData_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferDataImmediate::kCmdId == 1038,
+  COMPILE_ASSERT(BufferDataImmediate::kCmdId == 270,
                  GLES2_BufferDataImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferSubData::kCmdId == 1039,
+  COMPILE_ASSERT(BufferSubData::kCmdId == 271,
                  GLES2_BufferSubData_kCmdId_mismatch);
-  COMPILE_ASSERT(BufferSubDataImmediate::kCmdId == 1040,
+  COMPILE_ASSERT(BufferSubDataImmediate::kCmdId == 272,
                  GLES2_BufferSubDataImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CheckFramebufferStatus::kCmdId == 1041,
+  COMPILE_ASSERT(CheckFramebufferStatus::kCmdId == 273,
                  GLES2_CheckFramebufferStatus_kCmdId_mismatch);
-  COMPILE_ASSERT(Clear::kCmdId == 1042,
+  COMPILE_ASSERT(Clear::kCmdId == 274,
                  GLES2_Clear_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearColor::kCmdId == 1043,
+  COMPILE_ASSERT(ClearColor::kCmdId == 275,
                  GLES2_ClearColor_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearDepthf::kCmdId == 1044,
+  COMPILE_ASSERT(ClearDepthf::kCmdId == 276,
                  GLES2_ClearDepthf_kCmdId_mismatch);
-  COMPILE_ASSERT(ClearStencil::kCmdId == 1045,
+  COMPILE_ASSERT(ClearStencil::kCmdId == 277,
                  GLES2_ClearStencil_kCmdId_mismatch);
-  COMPILE_ASSERT(ColorMask::kCmdId == 1046,
+  COMPILE_ASSERT(ColorMask::kCmdId == 278,
                  GLES2_ColorMask_kCmdId_mismatch);
-  COMPILE_ASSERT(CompileShader::kCmdId == 1047,
+  COMPILE_ASSERT(CompileShader::kCmdId == 279,
                  GLES2_CompileShader_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexImage2D::kCmdId == 1048,
+  COMPILE_ASSERT(CompressedTexImage2D::kCmdId == 280,
                  GLES2_CompressedTexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexImage2DImmediate::kCmdId == 1049,
+  COMPILE_ASSERT(CompressedTexImage2DImmediate::kCmdId == 281,
                  GLES2_CompressedTexImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexSubImage2D::kCmdId == 1050,
+  COMPILE_ASSERT(CompressedTexSubImage2D::kCmdId == 282,
                  GLES2_CompressedTexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CompressedTexSubImage2DImmediate::kCmdId == 1051,
+  COMPILE_ASSERT(CompressedTexSubImage2DImmediate::kCmdId == 283,
                  GLES2_CompressedTexSubImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(CopyTexImage2D::kCmdId == 1052,
+  COMPILE_ASSERT(CopyTexImage2D::kCmdId == 284,
                  GLES2_CopyTexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CopyTexSubImage2D::kCmdId == 1053,
+  COMPILE_ASSERT(CopyTexSubImage2D::kCmdId == 285,
                  GLES2_CopyTexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(CreateProgram::kCmdId == 1054,
+  COMPILE_ASSERT(CreateProgram::kCmdId == 286,
                  GLES2_CreateProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(CreateShader::kCmdId == 1055,
+  COMPILE_ASSERT(CreateShader::kCmdId == 287,
                  GLES2_CreateShader_kCmdId_mismatch);
-  COMPILE_ASSERT(CullFace::kCmdId == 1056,
+  COMPILE_ASSERT(CullFace::kCmdId == 288,
                  GLES2_CullFace_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteBuffers::kCmdId == 1057,
+  COMPILE_ASSERT(DeleteBuffers::kCmdId == 289,
                  GLES2_DeleteBuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteBuffersImmediate::kCmdId == 1058,
+  COMPILE_ASSERT(DeleteBuffersImmediate::kCmdId == 290,
                  GLES2_DeleteBuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteFramebuffers::kCmdId == 1059,
+  COMPILE_ASSERT(DeleteFramebuffers::kCmdId == 291,
                  GLES2_DeleteFramebuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteFramebuffersImmediate::kCmdId == 1060,
+  COMPILE_ASSERT(DeleteFramebuffersImmediate::kCmdId == 292,
                  GLES2_DeleteFramebuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteProgram::kCmdId == 1061,
+  COMPILE_ASSERT(DeleteProgram::kCmdId == 293,
                  GLES2_DeleteProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteRenderbuffers::kCmdId == 1062,
+  COMPILE_ASSERT(DeleteRenderbuffers::kCmdId == 294,
                  GLES2_DeleteRenderbuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteRenderbuffersImmediate::kCmdId == 1063,
+  COMPILE_ASSERT(DeleteRenderbuffersImmediate::kCmdId == 295,
                  GLES2_DeleteRenderbuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteShader::kCmdId == 1064,
+  COMPILE_ASSERT(DeleteShader::kCmdId == 296,
                  GLES2_DeleteShader_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteTextures::kCmdId == 1065,
+  COMPILE_ASSERT(DeleteTextures::kCmdId == 297,
                  GLES2_DeleteTextures_kCmdId_mismatch);
-  COMPILE_ASSERT(DeleteTexturesImmediate::kCmdId == 1066,
+  COMPILE_ASSERT(DeleteTexturesImmediate::kCmdId == 298,
                  GLES2_DeleteTexturesImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthFunc::kCmdId == 1067,
+  COMPILE_ASSERT(DepthFunc::kCmdId == 299,
                  GLES2_DepthFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthMask::kCmdId == 1068,
+  COMPILE_ASSERT(DepthMask::kCmdId == 300,
                  GLES2_DepthMask_kCmdId_mismatch);
-  COMPILE_ASSERT(DepthRangef::kCmdId == 1069,
+  COMPILE_ASSERT(DepthRangef::kCmdId == 301,
                  GLES2_DepthRangef_kCmdId_mismatch);
-  COMPILE_ASSERT(DetachShader::kCmdId == 1070,
+  COMPILE_ASSERT(DetachShader::kCmdId == 302,
                  GLES2_DetachShader_kCmdId_mismatch);
-  COMPILE_ASSERT(Disable::kCmdId == 1071,
+  COMPILE_ASSERT(Disable::kCmdId == 303,
                  GLES2_Disable_kCmdId_mismatch);
-  COMPILE_ASSERT(DisableVertexAttribArray::kCmdId == 1072,
+  COMPILE_ASSERT(DisableVertexAttribArray::kCmdId == 304,
                  GLES2_DisableVertexAttribArray_kCmdId_mismatch);
-  COMPILE_ASSERT(DrawArrays::kCmdId == 1073,
+  COMPILE_ASSERT(DrawArrays::kCmdId == 305,
                  GLES2_DrawArrays_kCmdId_mismatch);
-  COMPILE_ASSERT(DrawElements::kCmdId == 1074,
+  COMPILE_ASSERT(DrawElements::kCmdId == 306,
                  GLES2_DrawElements_kCmdId_mismatch);
-  COMPILE_ASSERT(Enable::kCmdId == 1075,
+  COMPILE_ASSERT(Enable::kCmdId == 307,
                  GLES2_Enable_kCmdId_mismatch);
-  COMPILE_ASSERT(EnableVertexAttribArray::kCmdId == 1076,
+  COMPILE_ASSERT(EnableVertexAttribArray::kCmdId == 308,
                  GLES2_EnableVertexAttribArray_kCmdId_mismatch);
-  COMPILE_ASSERT(Finish::kCmdId == 1077,
+  COMPILE_ASSERT(Finish::kCmdId == 309,
                  GLES2_Finish_kCmdId_mismatch);
-  COMPILE_ASSERT(Flush::kCmdId == 1078,
+  COMPILE_ASSERT(Flush::kCmdId == 310,
                  GLES2_Flush_kCmdId_mismatch);
-  COMPILE_ASSERT(FramebufferRenderbuffer::kCmdId == 1079,
+  COMPILE_ASSERT(FramebufferRenderbuffer::kCmdId == 311,
                  GLES2_FramebufferRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(FramebufferTexture2D::kCmdId == 1080,
+  COMPILE_ASSERT(FramebufferTexture2D::kCmdId == 312,
                  GLES2_FramebufferTexture2D_kCmdId_mismatch);
-  COMPILE_ASSERT(FrontFace::kCmdId == 1081,
+  COMPILE_ASSERT(FrontFace::kCmdId == 313,
                  GLES2_FrontFace_kCmdId_mismatch);
-  COMPILE_ASSERT(GenBuffers::kCmdId == 1082,
+  COMPILE_ASSERT(GenBuffers::kCmdId == 314,
                  GLES2_GenBuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenBuffersImmediate::kCmdId == 1083,
+  COMPILE_ASSERT(GenBuffersImmediate::kCmdId == 315,
                  GLES2_GenBuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenerateMipmap::kCmdId == 1084,
+  COMPILE_ASSERT(GenerateMipmap::kCmdId == 316,
                  GLES2_GenerateMipmap_kCmdId_mismatch);
-  COMPILE_ASSERT(GenFramebuffers::kCmdId == 1085,
+  COMPILE_ASSERT(GenFramebuffers::kCmdId == 317,
                  GLES2_GenFramebuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenFramebuffersImmediate::kCmdId == 1086,
+  COMPILE_ASSERT(GenFramebuffersImmediate::kCmdId == 318,
                  GLES2_GenFramebuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenRenderbuffers::kCmdId == 1087,
+  COMPILE_ASSERT(GenRenderbuffers::kCmdId == 319,
                  GLES2_GenRenderbuffers_kCmdId_mismatch);
-  COMPILE_ASSERT(GenRenderbuffersImmediate::kCmdId == 1088,
+  COMPILE_ASSERT(GenRenderbuffersImmediate::kCmdId == 320,
                  GLES2_GenRenderbuffersImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GenTextures::kCmdId == 1089,
+  COMPILE_ASSERT(GenTextures::kCmdId == 321,
                  GLES2_GenTextures_kCmdId_mismatch);
-  COMPILE_ASSERT(GenTexturesImmediate::kCmdId == 1090,
+  COMPILE_ASSERT(GenTexturesImmediate::kCmdId == 322,
                  GLES2_GenTexturesImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetActiveAttrib::kCmdId == 1091,
+  COMPILE_ASSERT(GetActiveAttrib::kCmdId == 323,
                  GLES2_GetActiveAttrib_kCmdId_mismatch);
-  COMPILE_ASSERT(GetActiveUniform::kCmdId == 1092,
+  COMPILE_ASSERT(GetActiveUniform::kCmdId == 324,
                  GLES2_GetActiveUniform_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttachedShaders::kCmdId == 1093,
+  COMPILE_ASSERT(GetAttachedShaders::kCmdId == 325,
                  GLES2_GetAttachedShaders_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttribLocation::kCmdId == 1094,
+  COMPILE_ASSERT(GetAttribLocation::kCmdId == 326,
                  GLES2_GetAttribLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(GetAttribLocationImmediate::kCmdId == 1095,
+  COMPILE_ASSERT(GetAttribLocationImmediate::kCmdId == 327,
                  GLES2_GetAttribLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetBooleanv::kCmdId == 1096,
+  COMPILE_ASSERT(GetBooleanv::kCmdId == 328,
                  GLES2_GetBooleanv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetBufferParameteriv::kCmdId == 1097,
+  COMPILE_ASSERT(GetBufferParameteriv::kCmdId == 329,
                  GLES2_GetBufferParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetError::kCmdId == 1098,
+  COMPILE_ASSERT(GetError::kCmdId == 330,
                  GLES2_GetError_kCmdId_mismatch);
-  COMPILE_ASSERT(GetFloatv::kCmdId == 1099,
+  COMPILE_ASSERT(GetFloatv::kCmdId == 331,
                  GLES2_GetFloatv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetFramebufferAttachmentParameteriv::kCmdId == 1100,
+  COMPILE_ASSERT(GetFramebufferAttachmentParameteriv::kCmdId == 332,
                  GLES2_GetFramebufferAttachmentParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetIntegerv::kCmdId == 1101,
+  COMPILE_ASSERT(GetIntegerv::kCmdId == 333,
                  GLES2_GetIntegerv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetProgramiv::kCmdId == 1102,
+  COMPILE_ASSERT(GetProgramiv::kCmdId == 334,
                  GLES2_GetProgramiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetProgramInfoLog::kCmdId == 1103,
+  COMPILE_ASSERT(GetProgramInfoLog::kCmdId == 335,
                  GLES2_GetProgramInfoLog_kCmdId_mismatch);
-  COMPILE_ASSERT(GetRenderbufferParameteriv::kCmdId == 1104,
+  COMPILE_ASSERT(GetRenderbufferParameteriv::kCmdId == 336,
                  GLES2_GetRenderbufferParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderiv::kCmdId == 1105,
+  COMPILE_ASSERT(GetShaderiv::kCmdId == 337,
                  GLES2_GetShaderiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderInfoLog::kCmdId == 1106,
+  COMPILE_ASSERT(GetShaderInfoLog::kCmdId == 338,
                  GLES2_GetShaderInfoLog_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderPrecisionFormat::kCmdId == 1107,
+  COMPILE_ASSERT(GetShaderPrecisionFormat::kCmdId == 339,
                  GLES2_GetShaderPrecisionFormat_kCmdId_mismatch);
-  COMPILE_ASSERT(GetShaderSource::kCmdId == 1108,
+  COMPILE_ASSERT(GetShaderSource::kCmdId == 340,
                  GLES2_GetShaderSource_kCmdId_mismatch);
-  COMPILE_ASSERT(GetString::kCmdId == 1109,
+  COMPILE_ASSERT(GetString::kCmdId == 341,
                  GLES2_GetString_kCmdId_mismatch);
-  COMPILE_ASSERT(GetTexParameterfv::kCmdId == 1110,
+  COMPILE_ASSERT(GetTexParameterfv::kCmdId == 342,
                  GLES2_GetTexParameterfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetTexParameteriv::kCmdId == 1111,
+  COMPILE_ASSERT(GetTexParameteriv::kCmdId == 343,
                  GLES2_GetTexParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformfv::kCmdId == 1112,
+  COMPILE_ASSERT(GetUniformfv::kCmdId == 344,
                  GLES2_GetUniformfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformiv::kCmdId == 1113,
+  COMPILE_ASSERT(GetUniformiv::kCmdId == 345,
                  GLES2_GetUniformiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformLocation::kCmdId == 1114,
+  COMPILE_ASSERT(GetUniformLocation::kCmdId == 346,
                  GLES2_GetUniformLocation_kCmdId_mismatch);
-  COMPILE_ASSERT(GetUniformLocationImmediate::kCmdId == 1115,
+  COMPILE_ASSERT(GetUniformLocationImmediate::kCmdId == 347,
                  GLES2_GetUniformLocationImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribfv::kCmdId == 1116,
+  COMPILE_ASSERT(GetVertexAttribfv::kCmdId == 348,
                  GLES2_GetVertexAttribfv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribiv::kCmdId == 1117,
+  COMPILE_ASSERT(GetVertexAttribiv::kCmdId == 349,
                  GLES2_GetVertexAttribiv_kCmdId_mismatch);
-  COMPILE_ASSERT(GetVertexAttribPointerv::kCmdId == 1118,
+  COMPILE_ASSERT(GetVertexAttribPointerv::kCmdId == 350,
                  GLES2_GetVertexAttribPointerv_kCmdId_mismatch);
-  COMPILE_ASSERT(Hint::kCmdId == 1119,
+  COMPILE_ASSERT(Hint::kCmdId == 351,
                  GLES2_Hint_kCmdId_mismatch);
-  COMPILE_ASSERT(IsBuffer::kCmdId == 1120,
+  COMPILE_ASSERT(IsBuffer::kCmdId == 352,
                  GLES2_IsBuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsEnabled::kCmdId == 1121,
+  COMPILE_ASSERT(IsEnabled::kCmdId == 353,
                  GLES2_IsEnabled_kCmdId_mismatch);
-  COMPILE_ASSERT(IsFramebuffer::kCmdId == 1122,
+  COMPILE_ASSERT(IsFramebuffer::kCmdId == 354,
                  GLES2_IsFramebuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsProgram::kCmdId == 1123,
+  COMPILE_ASSERT(IsProgram::kCmdId == 355,
                  GLES2_IsProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(IsRenderbuffer::kCmdId == 1124,
+  COMPILE_ASSERT(IsRenderbuffer::kCmdId == 356,
                  GLES2_IsRenderbuffer_kCmdId_mismatch);
-  COMPILE_ASSERT(IsShader::kCmdId == 1125,
+  COMPILE_ASSERT(IsShader::kCmdId == 357,
                  GLES2_IsShader_kCmdId_mismatch);
-  COMPILE_ASSERT(IsTexture::kCmdId == 1126,
+  COMPILE_ASSERT(IsTexture::kCmdId == 358,
                  GLES2_IsTexture_kCmdId_mismatch);
-  COMPILE_ASSERT(LineWidth::kCmdId == 1127,
+  COMPILE_ASSERT(LineWidth::kCmdId == 359,
                  GLES2_LineWidth_kCmdId_mismatch);
-  COMPILE_ASSERT(LinkProgram::kCmdId == 1128,
+  COMPILE_ASSERT(LinkProgram::kCmdId == 360,
                  GLES2_LinkProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(PixelStorei::kCmdId == 1129,
+  COMPILE_ASSERT(PixelStorei::kCmdId == 361,
                  GLES2_PixelStorei_kCmdId_mismatch);
-  COMPILE_ASSERT(PolygonOffset::kCmdId == 1130,
+  COMPILE_ASSERT(PolygonOffset::kCmdId == 362,
                  GLES2_PolygonOffset_kCmdId_mismatch);
-  COMPILE_ASSERT(ReadPixels::kCmdId == 1131,
+  COMPILE_ASSERT(ReadPixels::kCmdId == 363,
                  GLES2_ReadPixels_kCmdId_mismatch);
-  COMPILE_ASSERT(RenderbufferStorage::kCmdId == 1132,
+  COMPILE_ASSERT(RenderbufferStorage::kCmdId == 364,
                  GLES2_RenderbufferStorage_kCmdId_mismatch);
-  COMPILE_ASSERT(SampleCoverage::kCmdId == 1133,
+  COMPILE_ASSERT(SampleCoverage::kCmdId == 365,
                  GLES2_SampleCoverage_kCmdId_mismatch);
-  COMPILE_ASSERT(Scissor::kCmdId == 1134,
+  COMPILE_ASSERT(Scissor::kCmdId == 366,
                  GLES2_Scissor_kCmdId_mismatch);
-  COMPILE_ASSERT(ShaderSource::kCmdId == 1135,
+  COMPILE_ASSERT(ShaderSource::kCmdId == 367,
                  GLES2_ShaderSource_kCmdId_mismatch);
-  COMPILE_ASSERT(ShaderSourceImmediate::kCmdId == 1136,
+  COMPILE_ASSERT(ShaderSourceImmediate::kCmdId == 368,
                  GLES2_ShaderSourceImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilFunc::kCmdId == 1137,
+  COMPILE_ASSERT(StencilFunc::kCmdId == 369,
                  GLES2_StencilFunc_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilFuncSeparate::kCmdId == 1138,
+  COMPILE_ASSERT(StencilFuncSeparate::kCmdId == 370,
                  GLES2_StencilFuncSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilMask::kCmdId == 1139,
+  COMPILE_ASSERT(StencilMask::kCmdId == 371,
                  GLES2_StencilMask_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilMaskSeparate::kCmdId == 1140,
+  COMPILE_ASSERT(StencilMaskSeparate::kCmdId == 372,
                  GLES2_StencilMaskSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilOp::kCmdId == 1141,
+  COMPILE_ASSERT(StencilOp::kCmdId == 373,
                  GLES2_StencilOp_kCmdId_mismatch);
-  COMPILE_ASSERT(StencilOpSeparate::kCmdId == 1142,
+  COMPILE_ASSERT(StencilOpSeparate::kCmdId == 374,
                  GLES2_StencilOpSeparate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexImage2D::kCmdId == 1143,
+  COMPILE_ASSERT(TexImage2D::kCmdId == 375,
                  GLES2_TexImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(TexImage2DImmediate::kCmdId == 1144,
+  COMPILE_ASSERT(TexImage2DImmediate::kCmdId == 376,
                  GLES2_TexImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterf::kCmdId == 1145,
+  COMPILE_ASSERT(TexParameterf::kCmdId == 377,
                  GLES2_TexParameterf_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterfv::kCmdId == 1146,
+  COMPILE_ASSERT(TexParameterfv::kCmdId == 378,
                  GLES2_TexParameterfv_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterfvImmediate::kCmdId == 1147,
+  COMPILE_ASSERT(TexParameterfvImmediate::kCmdId == 379,
                  GLES2_TexParameterfvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameteri::kCmdId == 1148,
+  COMPILE_ASSERT(TexParameteri::kCmdId == 380,
                  GLES2_TexParameteri_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameteriv::kCmdId == 1149,
+  COMPILE_ASSERT(TexParameteriv::kCmdId == 381,
                  GLES2_TexParameteriv_kCmdId_mismatch);
-  COMPILE_ASSERT(TexParameterivImmediate::kCmdId == 1150,
+  COMPILE_ASSERT(TexParameterivImmediate::kCmdId == 382,
                  GLES2_TexParameterivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(TexSubImage2D::kCmdId == 1151,
+  COMPILE_ASSERT(TexSubImage2D::kCmdId == 383,
                  GLES2_TexSubImage2D_kCmdId_mismatch);
-  COMPILE_ASSERT(TexSubImage2DImmediate::kCmdId == 1152,
+  COMPILE_ASSERT(TexSubImage2DImmediate::kCmdId == 384,
                  GLES2_TexSubImage2DImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1f::kCmdId == 1153,
+  COMPILE_ASSERT(Uniform1f::kCmdId == 385,
                  GLES2_Uniform1f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1fv::kCmdId == 1154,
+  COMPILE_ASSERT(Uniform1fv::kCmdId == 386,
                  GLES2_Uniform1fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1fvImmediate::kCmdId == 1155,
+  COMPILE_ASSERT(Uniform1fvImmediate::kCmdId == 387,
                  GLES2_Uniform1fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1i::kCmdId == 1156,
+  COMPILE_ASSERT(Uniform1i::kCmdId == 388,
                  GLES2_Uniform1i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1iv::kCmdId == 1157,
+  COMPILE_ASSERT(Uniform1iv::kCmdId == 389,
                  GLES2_Uniform1iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform1ivImmediate::kCmdId == 1158,
+  COMPILE_ASSERT(Uniform1ivImmediate::kCmdId == 390,
                  GLES2_Uniform1ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2f::kCmdId == 1159,
+  COMPILE_ASSERT(Uniform2f::kCmdId == 391,
                  GLES2_Uniform2f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2fv::kCmdId == 1160,
+  COMPILE_ASSERT(Uniform2fv::kCmdId == 392,
                  GLES2_Uniform2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2fvImmediate::kCmdId == 1161,
+  COMPILE_ASSERT(Uniform2fvImmediate::kCmdId == 393,
                  GLES2_Uniform2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2i::kCmdId == 1162,
+  COMPILE_ASSERT(Uniform2i::kCmdId == 394,
                  GLES2_Uniform2i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2iv::kCmdId == 1163,
+  COMPILE_ASSERT(Uniform2iv::kCmdId == 395,
                  GLES2_Uniform2iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform2ivImmediate::kCmdId == 1164,
+  COMPILE_ASSERT(Uniform2ivImmediate::kCmdId == 396,
                  GLES2_Uniform2ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3f::kCmdId == 1165,
+  COMPILE_ASSERT(Uniform3f::kCmdId == 397,
                  GLES2_Uniform3f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3fv::kCmdId == 1166,
+  COMPILE_ASSERT(Uniform3fv::kCmdId == 398,
                  GLES2_Uniform3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3fvImmediate::kCmdId == 1167,
+  COMPILE_ASSERT(Uniform3fvImmediate::kCmdId == 399,
                  GLES2_Uniform3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3i::kCmdId == 1168,
+  COMPILE_ASSERT(Uniform3i::kCmdId == 400,
                  GLES2_Uniform3i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3iv::kCmdId == 1169,
+  COMPILE_ASSERT(Uniform3iv::kCmdId == 401,
                  GLES2_Uniform3iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform3ivImmediate::kCmdId == 1170,
+  COMPILE_ASSERT(Uniform3ivImmediate::kCmdId == 402,
                  GLES2_Uniform3ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4f::kCmdId == 1171,
+  COMPILE_ASSERT(Uniform4f::kCmdId == 403,
                  GLES2_Uniform4f_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4fv::kCmdId == 1172,
+  COMPILE_ASSERT(Uniform4fv::kCmdId == 404,
                  GLES2_Uniform4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4fvImmediate::kCmdId == 1173,
+  COMPILE_ASSERT(Uniform4fvImmediate::kCmdId == 405,
                  GLES2_Uniform4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4i::kCmdId == 1174,
+  COMPILE_ASSERT(Uniform4i::kCmdId == 406,
                  GLES2_Uniform4i_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4iv::kCmdId == 1175,
+  COMPILE_ASSERT(Uniform4iv::kCmdId == 407,
                  GLES2_Uniform4iv_kCmdId_mismatch);
-  COMPILE_ASSERT(Uniform4ivImmediate::kCmdId == 1176,
+  COMPILE_ASSERT(Uniform4ivImmediate::kCmdId == 408,
                  GLES2_Uniform4ivImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix2fv::kCmdId == 1177,
+  COMPILE_ASSERT(UniformMatrix2fv::kCmdId == 409,
                  GLES2_UniformMatrix2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix2fvImmediate::kCmdId == 1178,
+  COMPILE_ASSERT(UniformMatrix2fvImmediate::kCmdId == 410,
                  GLES2_UniformMatrix2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix3fv::kCmdId == 1179,
+  COMPILE_ASSERT(UniformMatrix3fv::kCmdId == 411,
                  GLES2_UniformMatrix3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix3fvImmediate::kCmdId == 1180,
+  COMPILE_ASSERT(UniformMatrix3fvImmediate::kCmdId == 412,
                  GLES2_UniformMatrix3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix4fv::kCmdId == 1181,
+  COMPILE_ASSERT(UniformMatrix4fv::kCmdId == 413,
                  GLES2_UniformMatrix4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(UniformMatrix4fvImmediate::kCmdId == 1182,
+  COMPILE_ASSERT(UniformMatrix4fvImmediate::kCmdId == 414,
                  GLES2_UniformMatrix4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(UseProgram::kCmdId == 1183,
+  COMPILE_ASSERT(UseProgram::kCmdId == 415,
                  GLES2_UseProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(ValidateProgram::kCmdId == 1184,
+  COMPILE_ASSERT(ValidateProgram::kCmdId == 416,
                  GLES2_ValidateProgram_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1f::kCmdId == 1185,
+  COMPILE_ASSERT(VertexAttrib1f::kCmdId == 417,
                  GLES2_VertexAttrib1f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1fv::kCmdId == 1186,
+  COMPILE_ASSERT(VertexAttrib1fv::kCmdId == 418,
                  GLES2_VertexAttrib1fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib1fvImmediate::kCmdId == 1187,
+  COMPILE_ASSERT(VertexAttrib1fvImmediate::kCmdId == 419,
                  GLES2_VertexAttrib1fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2f::kCmdId == 1188,
+  COMPILE_ASSERT(VertexAttrib2f::kCmdId == 420,
                  GLES2_VertexAttrib2f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2fv::kCmdId == 1189,
+  COMPILE_ASSERT(VertexAttrib2fv::kCmdId == 421,
                  GLES2_VertexAttrib2fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib2fvImmediate::kCmdId == 1190,
+  COMPILE_ASSERT(VertexAttrib2fvImmediate::kCmdId == 422,
                  GLES2_VertexAttrib2fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3f::kCmdId == 1191,
+  COMPILE_ASSERT(VertexAttrib3f::kCmdId == 423,
                  GLES2_VertexAttrib3f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3fv::kCmdId == 1192,
+  COMPILE_ASSERT(VertexAttrib3fv::kCmdId == 424,
                  GLES2_VertexAttrib3fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib3fvImmediate::kCmdId == 1193,
+  COMPILE_ASSERT(VertexAttrib3fvImmediate::kCmdId == 425,
                  GLES2_VertexAttrib3fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4f::kCmdId == 1194,
+  COMPILE_ASSERT(VertexAttrib4f::kCmdId == 426,
                  GLES2_VertexAttrib4f_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4fv::kCmdId == 1195,
+  COMPILE_ASSERT(VertexAttrib4fv::kCmdId == 427,
                  GLES2_VertexAttrib4fv_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttrib4fvImmediate::kCmdId == 1196,
+  COMPILE_ASSERT(VertexAttrib4fvImmediate::kCmdId == 428,
                  GLES2_VertexAttrib4fvImmediate_kCmdId_mismatch);
-  COMPILE_ASSERT(VertexAttribPointer::kCmdId == 1197,
+  COMPILE_ASSERT(VertexAttribPointer::kCmdId == 429,
                  GLES2_VertexAttribPointer_kCmdId_mismatch);
-  COMPILE_ASSERT(Viewport::kCmdId == 1198,
+  COMPILE_ASSERT(Viewport::kCmdId == 430,
                  GLES2_Viewport_kCmdId_mismatch);
-  COMPILE_ASSERT(SwapBuffers::kCmdId == 1199,
+  COMPILE_ASSERT(SwapBuffers::kCmdId == 431,
                  GLES2_SwapBuffers_kCmdId_mismatch);
 }
 }  // namespace gles2
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index 9e9d5c6..fce51d0 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -1,182 +1,182 @@
 // This file is auto-generated. DO NOT EDIT!
 
 #define GLES2_COMMAND_LIST(OP) \
-  OP(ActiveTexture)                                            /* 1024 */ \
-  OP(AttachShader)                                             /* 1025 */ \
-  OP(BindAttribLocation)                                       /* 1026 */ \
-  OP(BindAttribLocationImmediate)                              /* 1027 */ \
-  OP(BindBuffer)                                               /* 1028 */ \
-  OP(BindFramebuffer)                                          /* 1029 */ \
-  OP(BindRenderbuffer)                                         /* 1030 */ \
-  OP(BindTexture)                                              /* 1031 */ \
-  OP(BlendColor)                                               /* 1032 */ \
-  OP(BlendEquation)                                            /* 1033 */ \
-  OP(BlendEquationSeparate)                                    /* 1034 */ \
-  OP(BlendFunc)                                                /* 1035 */ \
-  OP(BlendFuncSeparate)                                        /* 1036 */ \
-  OP(BufferData)                                               /* 1037 */ \
-  OP(BufferDataImmediate)                                      /* 1038 */ \
-  OP(BufferSubData)                                            /* 1039 */ \
-  OP(BufferSubDataImmediate)                                   /* 1040 */ \
-  OP(CheckFramebufferStatus)                                   /* 1041 */ \
-  OP(Clear)                                                    /* 1042 */ \
-  OP(ClearColor)                                               /* 1043 */ \
-  OP(ClearDepthf)                                              /* 1044 */ \
-  OP(ClearStencil)                                             /* 1045 */ \
-  OP(ColorMask)                                                /* 1046 */ \
-  OP(CompileShader)                                            /* 1047 */ \
-  OP(CompressedTexImage2D)                                     /* 1048 */ \
-  OP(CompressedTexImage2DImmediate)                            /* 1049 */ \
-  OP(CompressedTexSubImage2D)                                  /* 1050 */ \
-  OP(CompressedTexSubImage2DImmediate)                         /* 1051 */ \
-  OP(CopyTexImage2D)                                           /* 1052 */ \
-  OP(CopyTexSubImage2D)                                        /* 1053 */ \
-  OP(CreateProgram)                                            /* 1054 */ \
-  OP(CreateShader)                                             /* 1055 */ \
-  OP(CullFace)                                                 /* 1056 */ \
-  OP(DeleteBuffers)                                            /* 1057 */ \
-  OP(DeleteBuffersImmediate)                                   /* 1058 */ \
-  OP(DeleteFramebuffers)                                       /* 1059 */ \
-  OP(DeleteFramebuffersImmediate)                              /* 1060 */ \
-  OP(DeleteProgram)                                            /* 1061 */ \
-  OP(DeleteRenderbuffers)                                      /* 1062 */ \
-  OP(DeleteRenderbuffersImmediate)                             /* 1063 */ \
-  OP(DeleteShader)                                             /* 1064 */ \
-  OP(DeleteTextures)                                           /* 1065 */ \
-  OP(DeleteTexturesImmediate)                                  /* 1066 */ \
-  OP(DepthFunc)                                                /* 1067 */ \
-  OP(DepthMask)                                                /* 1068 */ \
-  OP(DepthRangef)                                              /* 1069 */ \
-  OP(DetachShader)                                             /* 1070 */ \
-  OP(Disable)                                                  /* 1071 */ \
-  OP(DisableVertexAttribArray)                                 /* 1072 */ \
-  OP(DrawArrays)                                               /* 1073 */ \
-  OP(DrawElements)                                             /* 1074 */ \
-  OP(Enable)                                                   /* 1075 */ \
-  OP(EnableVertexAttribArray)                                  /* 1076 */ \
-  OP(Finish)                                                   /* 1077 */ \
-  OP(Flush)                                                    /* 1078 */ \
-  OP(FramebufferRenderbuffer)                                  /* 1079 */ \
-  OP(FramebufferTexture2D)                                     /* 1080 */ \
-  OP(FrontFace)                                                /* 1081 */ \
-  OP(GenBuffers)                                               /* 1082 */ \
-  OP(GenBuffersImmediate)                                      /* 1083 */ \
-  OP(GenerateMipmap)                                           /* 1084 */ \
-  OP(GenFramebuffers)                                          /* 1085 */ \
-  OP(GenFramebuffersImmediate)                                 /* 1086 */ \
-  OP(GenRenderbuffers)                                         /* 1087 */ \
-  OP(GenRenderbuffersImmediate)                                /* 1088 */ \
-  OP(GenTextures)                                              /* 1089 */ \
-  OP(GenTexturesImmediate)                                     /* 1090 */ \
-  OP(GetActiveAttrib)                                          /* 1091 */ \
-  OP(GetActiveUniform)                                         /* 1092 */ \
-  OP(GetAttachedShaders)                                       /* 1093 */ \
-  OP(GetAttribLocation)                                        /* 1094 */ \
-  OP(GetAttribLocationImmediate)                               /* 1095 */ \
-  OP(GetBooleanv)                                              /* 1096 */ \
-  OP(GetBufferParameteriv)                                     /* 1097 */ \
-  OP(GetError)                                                 /* 1098 */ \
-  OP(GetFloatv)                                                /* 1099 */ \
-  OP(GetFramebufferAttachmentParameteriv)                      /* 1100 */ \
-  OP(GetIntegerv)                                              /* 1101 */ \
-  OP(GetProgramiv)                                             /* 1102 */ \
-  OP(GetProgramInfoLog)                                        /* 1103 */ \
-  OP(GetRenderbufferParameteriv)                               /* 1104 */ \
-  OP(GetShaderiv)                                              /* 1105 */ \
-  OP(GetShaderInfoLog)                                         /* 1106 */ \
-  OP(GetShaderPrecisionFormat)                                 /* 1107 */ \
-  OP(GetShaderSource)                                          /* 1108 */ \
-  OP(GetString)                                                /* 1109 */ \
-  OP(GetTexParameterfv)                                        /* 1110 */ \
-  OP(GetTexParameteriv)                                        /* 1111 */ \
-  OP(GetUniformfv)                                             /* 1112 */ \
-  OP(GetUniformiv)                                             /* 1113 */ \
-  OP(GetUniformLocation)                                       /* 1114 */ \
-  OP(GetUniformLocationImmediate)                              /* 1115 */ \
-  OP(GetVertexAttribfv)                                        /* 1116 */ \
-  OP(GetVertexAttribiv)                                        /* 1117 */ \
-  OP(GetVertexAttribPointerv)                                  /* 1118 */ \
-  OP(Hint)                                                     /* 1119 */ \
-  OP(IsBuffer)                                                 /* 1120 */ \
-  OP(IsEnabled)                                                /* 1121 */ \
-  OP(IsFramebuffer)                                            /* 1122 */ \
-  OP(IsProgram)                                                /* 1123 */ \
-  OP(IsRenderbuffer)                                           /* 1124 */ \
-  OP(IsShader)                                                 /* 1125 */ \
-  OP(IsTexture)                                                /* 1126 */ \
-  OP(LineWidth)                                                /* 1127 */ \
-  OP(LinkProgram)                                              /* 1128 */ \
-  OP(PixelStorei)                                              /* 1129 */ \
-  OP(PolygonOffset)                                            /* 1130 */ \
-  OP(ReadPixels)                                               /* 1131 */ \
-  OP(RenderbufferStorage)                                      /* 1132 */ \
-  OP(SampleCoverage)                                           /* 1133 */ \
-  OP(Scissor)                                                  /* 1134 */ \
-  OP(ShaderSource)                                             /* 1135 */ \
-  OP(ShaderSourceImmediate)                                    /* 1136 */ \
-  OP(StencilFunc)                                              /* 1137 */ \
-  OP(StencilFuncSeparate)                                      /* 1138 */ \
-  OP(StencilMask)                                              /* 1139 */ \
-  OP(StencilMaskSeparate)                                      /* 1140 */ \
-  OP(StencilOp)                                                /* 1141 */ \
-  OP(StencilOpSeparate)                                        /* 1142 */ \
-  OP(TexImage2D)                                               /* 1143 */ \
-  OP(TexImage2DImmediate)                                      /* 1144 */ \
-  OP(TexParameterf)                                            /* 1145 */ \
-  OP(TexParameterfv)                                           /* 1146 */ \
-  OP(TexParameterfvImmediate)                                  /* 1147 */ \
-  OP(TexParameteri)                                            /* 1148 */ \
-  OP(TexParameteriv)                                           /* 1149 */ \
-  OP(TexParameterivImmediate)                                  /* 1150 */ \
-  OP(TexSubImage2D)                                            /* 1151 */ \
-  OP(TexSubImage2DImmediate)                                   /* 1152 */ \
-  OP(Uniform1f)                                                /* 1153 */ \
-  OP(Uniform1fv)                                               /* 1154 */ \
-  OP(Uniform1fvImmediate)                                      /* 1155 */ \
-  OP(Uniform1i)                                                /* 1156 */ \
-  OP(Uniform1iv)                                               /* 1157 */ \
-  OP(Uniform1ivImmediate)                                      /* 1158 */ \
-  OP(Uniform2f)                                                /* 1159 */ \
-  OP(Uniform2fv)                                               /* 1160 */ \
-  OP(Uniform2fvImmediate)                                      /* 1161 */ \
-  OP(Uniform2i)                                                /* 1162 */ \
-  OP(Uniform2iv)                                               /* 1163 */ \
-  OP(Uniform2ivImmediate)                                      /* 1164 */ \
-  OP(Uniform3f)                                                /* 1165 */ \
-  OP(Uniform3fv)                                               /* 1166 */ \
-  OP(Uniform3fvImmediate)                                      /* 1167 */ \
-  OP(Uniform3i)                                                /* 1168 */ \
-  OP(Uniform3iv)                                               /* 1169 */ \
-  OP(Uniform3ivImmediate)                                      /* 1170 */ \
-  OP(Uniform4f)                                                /* 1171 */ \
-  OP(Uniform4fv)                                               /* 1172 */ \
-  OP(Uniform4fvImmediate)                                      /* 1173 */ \
-  OP(Uniform4i)                                                /* 1174 */ \
-  OP(Uniform4iv)                                               /* 1175 */ \
-  OP(Uniform4ivImmediate)                                      /* 1176 */ \
-  OP(UniformMatrix2fv)                                         /* 1177 */ \
-  OP(UniformMatrix2fvImmediate)                                /* 1178 */ \
-  OP(UniformMatrix3fv)                                         /* 1179 */ \
-  OP(UniformMatrix3fvImmediate)                                /* 1180 */ \
-  OP(UniformMatrix4fv)                                         /* 1181 */ \
-  OP(UniformMatrix4fvImmediate)                                /* 1182 */ \
-  OP(UseProgram)                                               /* 1183 */ \
-  OP(ValidateProgram)                                          /* 1184 */ \
-  OP(VertexAttrib1f)                                           /* 1185 */ \
-  OP(VertexAttrib1fv)                                          /* 1186 */ \
-  OP(VertexAttrib1fvImmediate)                                 /* 1187 */ \
-  OP(VertexAttrib2f)                                           /* 1188 */ \
-  OP(VertexAttrib2fv)                                          /* 1189 */ \
-  OP(VertexAttrib2fvImmediate)                                 /* 1190 */ \
-  OP(VertexAttrib3f)                                           /* 1191 */ \
-  OP(VertexAttrib3fv)                                          /* 1192 */ \
-  OP(VertexAttrib3fvImmediate)                                 /* 1193 */ \
-  OP(VertexAttrib4f)                                           /* 1194 */ \
-  OP(VertexAttrib4fv)                                          /* 1195 */ \
-  OP(VertexAttrib4fvImmediate)                                 /* 1196 */ \
-  OP(VertexAttribPointer)                                      /* 1197 */ \
-  OP(Viewport)                                                 /* 1198 */ \
-  OP(SwapBuffers)                                              /* 1199 */ \
+  OP(ActiveTexture)                                            /* 256 */ \
+  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 */ \
 
 enum CommandId {
   kStartPoint = cmd::kLastCommonId,  // All GLES2 commands start after this.
diff --git a/gpu/command_buffer/service/common_decoder.cc b/gpu/command_buffer/service/common_decoder.cc
index 22bf445..5830cd4 100644
--- a/gpu/command_buffer/service/common_decoder.cc
+++ b/gpu/command_buffer/service/common_decoder.cc
@@ -119,4 +119,74 @@ parse_error::ParseError CommonDecoder::HandleSetToken(
   return parse_error::kParseNoError;
 }
 
+parse_error::ParseError CommonDecoder::HandleJump(
+    uint32 arg_count,
+    const cmd::Jump& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleJumpRelative(
+    uint32 arg_count,
+    const cmd::JumpRelative& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleCall(
+    uint32 arg_count,
+    const cmd::Call& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleCallRelative(
+    uint32 arg_count,
+    const cmd::CallRelative& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleReturn(
+    uint32 arg_count,
+    const cmd::Return& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleSetBucketSize(
+    uint32 arg_count,
+    const cmd::SetBucketSize& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleSetBucketData(
+    uint32 arg_count,
+    const cmd::SetBucketData& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleSetBucketDataImmediate(
+    uint32 arg_count,
+    const cmd::SetBucketDataImmediate& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleGetResultSize(
+    uint32 arg_count,
+    const cmd::GetResultSize& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
+parse_error::ParseError CommonDecoder::HandleGetResultData(
+    uint32 arg_count,
+    const cmd::GetResultData& args) {
+  DCHECK(false);  // TODO(gman): Implement.
+  return parse_error::kParseNoError;
+}
+
 }  // namespace command_buffer
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index aa89b51..0b06d7d 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -86,6 +86,7 @@
         'command_buffer/common/cmd_buffer_common.cc',
         'command_buffer/common/command_buffer.h',
         'command_buffer/common/command_buffer_mock.h',
+        'command_buffer/common/constants.h',
         'command_buffer/common/gles2_cmd_ids_autogen.h',
         'command_buffer/common/gles2_cmd_ids.h',
         'command_buffer/common/gles2_cmd_format_autogen.h',