Remove GetAttribLocationImmediate and GetUniformLocationImmediate.

BUG=

Review URL: https://codereview.chromium.org/26373002

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

10 files changed, 190 insertions, 457 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 5769ef3..e2e1a63 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1623,7 +1623,7 @@ _FUNCTION_INFO = {
   },
   'GetAttribLocation': {
     'type': 'HandWritten',
-    'immediate': True,
+    'immediate': False,
     'bucket': True,
     'needs_size': True,
     'cmd_args':
@@ -1775,7 +1775,7 @@ _FUNCTION_INFO = {
   },
   'GetUniformLocation': {
     'type': 'HandWritten',
-    'immediate': True,
+    'immediate': False,
     'bucket': True,
     'needs_size': True,
     'cmd_args':
diff --git a/gpu/command_buffer/client/gles2_cmd_helper.h b/gpu/command_buffer/client/gles2_cmd_helper.h
index 052eeaa..72fae31 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper.h
@@ -38,19 +38,6 @@ class GPU_EXPORT GLES2CmdHelper : public CommandBufferHelper {
     }
   }
 
-  void GetAttribLocationImmediate(
-      GLuint program, const char* name,
-      uint32 location_shm_id, uint32 location_shm_offset) {
-    const uint32 size = gles2::cmds::GetAttribLocationImmediate::ComputeSize(
-        name);
-    gles2::cmds::GetAttribLocationImmediate* c =
-        GetImmediateCmdSpaceTotalSize<gles2::cmds::GetAttribLocationImmediate>(
-            size);
-    if (c) {
-      c->Init(program, name, location_shm_id, location_shm_offset);
-    }
-  }
-
   void GetAttribLocationBucket(
       GLuint program, uint32 name_bucket_id,
       uint32 location_shm_id, uint32 location_shm_offset) {
@@ -73,19 +60,6 @@ class GPU_EXPORT GLES2CmdHelper : public CommandBufferHelper {
     }
   }
 
-  void GetUniformLocationImmediate(
-      GLuint program, const char* name,
-      uint32 location_shm_id, uint32 location_shm_offset) {
-    const uint32 size = gles2::cmds::GetUniformLocationImmediate::ComputeSize(
-        name);
-    gles2::cmds::GetUniformLocationImmediate* c =
-        GetImmediateCmdSpaceTotalSize<gles2::cmds::GetUniformLocationImmediate>(
-            size);
-    if (c) {
-      c->Init(program, name, location_shm_id, location_shm_offset);
-    }
-  }
-
   void GetUniformLocationBucket(
       GLuint program, uint32 name_bucket_id,
       uint32 location_shm_id, uint32 location_shm_offset) {
diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h
index 49c0270..b2ab12e 100644
--- a/gpu/command_buffer/common/gles2_cmd_format.h
+++ b/gpu/command_buffer/common/gles2_cmd_format.h
@@ -243,66 +243,6 @@ COMPILE_ASSERT(offsetof(GetAttribLocation, location_shm_offset) == 20,
 COMPILE_ASSERT(offsetof(GetAttribLocation, data_size) == 24,
                OffsetOf_GetAttribLocation_data_size_not_24);
 
-struct GetAttribLocationImmediate {
-  typedef GetAttribLocationImmediate ValueType;
-  static const CommandId kCmdId = kGetAttribLocationImmediate;
-  static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
-
-  typedef GLint Result;
-
-  static uint32 ComputeDataSize(const char* s) {
-    return base::checked_numeric_cast<uint32>(strlen(s));
-  }
-
-  static uint32 ComputeSize(const char* s) {
-    return base::checked_numeric_cast<uint32>(sizeof(ValueType) +
-                                              ComputeDataSize(s));
-  }
-
-  void SetHeader(const char* s) {
-    header.SetCmdByTotalSize<ValueType>(ComputeSize(s));
-  }
-
-  void Init(
-      GLuint _program, const char* _name,
-      uint32 _location_shm_id, uint32 _location_shm_offset) {
-    SetHeader(_name);
-    program = _program;
-    location_shm_id = _location_shm_id;
-    location_shm_offset = _location_shm_offset;
-    data_size = ComputeDataSize(_name);
-    memcpy(ImmediateDataAddress(this), _name, data_size);
-  }
-
-  void* Set(
-      void* cmd, GLuint _program, const char* _name,
-      uint32 _location_shm_id, uint32 _location_shm_offset) {
-    uint32 total_size = ComputeSize(_name);
-    static_cast<ValueType*>(
-        cmd)->Init(_program, _name, _location_shm_id, _location_shm_offset);
-    return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size);
-  }
-
-  CommandHeader header;
-  uint32 program;
-  uint32 location_shm_id;
-  uint32 location_shm_offset;
-  uint32 data_size;
-};
-
-COMPILE_ASSERT(sizeof(GetAttribLocationImmediate) == 20,
-               Sizeof_GetAttribLocationImmediate_is_not_20);
-COMPILE_ASSERT(offsetof(GetAttribLocationImmediate, header) == 0,
-               OffsetOf_GetAttribLocationImmediate_header_not_0);
-COMPILE_ASSERT(offsetof(GetAttribLocationImmediate, program) == 4,
-               OffsetOf_GetAttribLocationImmediate_program_not_4);
-COMPILE_ASSERT(offsetof(GetAttribLocationImmediate, location_shm_id) == 8,
-               OffsetOf_GetAttribLocationImmediate_location_shm_id_not_8);
-COMPILE_ASSERT(offsetof(GetAttribLocationImmediate, location_shm_offset) == 12,
-               OffsetOf_GetAttribLocationImmediate_location_shm_offset_not_12);
-COMPILE_ASSERT(offsetof(GetAttribLocationImmediate, data_size) == 16,
-               OffsetOf_GetAttribLocationImmediate_data_size_not_16);
-
 
 struct GetAttribLocationBucket {
   typedef GetAttribLocationBucket ValueType;
@@ -424,67 +364,6 @@ COMPILE_ASSERT(offsetof(GetUniformLocation, location_shm_offset) == 20,
 COMPILE_ASSERT(offsetof(GetUniformLocation, data_size) == 24,
                OffsetOf_GetUniformLocation_data_size_not_24);
 
-struct GetUniformLocationImmediate {
-  typedef GetUniformLocationImmediate ValueType;
-  static const CommandId kCmdId = kGetUniformLocationImmediate;
-  static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
-
-  typedef GLint Result;
-
-  static uint32 ComputeDataSize(const char* s) {
-    return base::checked_numeric_cast<uint32>(strlen(s));
-  }
-
-  static uint32 ComputeSize(const char* s) {
-    return base::checked_numeric_cast<uint32>(sizeof(ValueType) +
-                                              ComputeDataSize(s));
-  }
-
-  void SetHeader(const char* s) {
-    header.SetCmdByTotalSize<ValueType>(ComputeSize(s));
-  }
-
-  void Init(
-      GLuint _program, const char* _name,
-      uint32 _location_shm_id, uint32 _location_shm_offset) {
-    SetHeader(_name);
-    program = _program;
-    location_shm_id = _location_shm_id;
-    location_shm_offset = _location_shm_offset;
-    data_size = ComputeDataSize(_name);
-    memcpy(ImmediateDataAddress(this), _name, data_size);
-  }
-
-  void* Set(
-      void* cmd, GLuint _program, const char* _name,
-      uint32 _location_shm_id, uint32 _location_shm_offset) {
-    uint32 total_size = ComputeSize(_name);
-    static_cast<ValueType*>(
-        cmd)->Init(_program, _name, _location_shm_id, _location_shm_offset);
-    return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size);
-  }
-
-  CommandHeader header;
-  uint32 program;
-  uint32 location_shm_id;
-  uint32 location_shm_offset;
-  uint32 data_size;
-};
-
-COMPILE_ASSERT(sizeof(GetUniformLocationImmediate) == 20,
-               Sizeof_GetUniformLocationImmediate_is_not_20);
-COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, header) == 0,
-               OffsetOf_GetUniformLocationImmediate_header_not_0);
-COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, program) == 4,
-               OffsetOf_GetUniformLocationImmediate_program_not_4);
-COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, location_shm_id) == 8,
-               OffsetOf_GetUniformLocationImmediate_location_shm_id_not_8);
-COMPILE_ASSERT(
-    offsetof(GetUniformLocationImmediate, location_shm_offset) == 12,
-               OffsetOf_GetUniformLocationImmediate_location_shm_offset_not_12);
-COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, data_size) == 16,
-               OffsetOf_GetUniformLocationImmediate_data_size_not_16);
-
 struct GetUniformLocationBucket {
   typedef GetUniformLocationBucket ValueType;
   static const CommandId kCmdId = kGetUniformLocationBucket;
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index 451bb88..4b03509 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -1214,7 +1214,6 @@ TEST_F(GLES2FormatTest, GetAttachedShaders) {
 }
 
 // TODO(gman): Write test for GetAttribLocation
-// TODO(gman): Write test for GetAttribLocationImmediate
 // TODO(gman): Write test for GetAttribLocationBucket
 TEST_F(GLES2FormatTest, GetBooleanv) {
   cmds::GetBooleanv& cmd = *GetBufferAs<cmds::GetBooleanv>();
@@ -1539,7 +1538,6 @@ TEST_F(GLES2FormatTest, GetUniformiv) {
 }
 
 // TODO(gman): Write test for GetUniformLocation
-// TODO(gman): Write test for GetUniformLocationImmediate
 // TODO(gman): Write test for GetUniformLocationBucket
 TEST_F(GLES2FormatTest, GetVertexAttribfv) {
   cmds::GetVertexAttribfv& cmd = *GetBufferAs<cmds::GetVertexAttribfv>();
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index b4ee39e..1c58cd8 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -83,174 +83,172 @@
   OP(GetActiveUniform)                                         /* 326 */ \
   OP(GetAttachedShaders)                                       /* 327 */ \
   OP(GetAttribLocation)                                        /* 328 */ \
-  OP(GetAttribLocationImmediate)                               /* 329 */ \
-  OP(GetAttribLocationBucket)                                  /* 330 */ \
-  OP(GetBooleanv)                                              /* 331 */ \
-  OP(GetBufferParameteriv)                                     /* 332 */ \
-  OP(GetError)                                                 /* 333 */ \
-  OP(GetFloatv)                                                /* 334 */ \
-  OP(GetFramebufferAttachmentParameteriv)                      /* 335 */ \
-  OP(GetIntegerv)                                              /* 336 */ \
-  OP(GetProgramiv)                                             /* 337 */ \
-  OP(GetProgramInfoLog)                                        /* 338 */ \
-  OP(GetRenderbufferParameteriv)                               /* 339 */ \
-  OP(GetShaderiv)                                              /* 340 */ \
-  OP(GetShaderInfoLog)                                         /* 341 */ \
-  OP(GetShaderPrecisionFormat)                                 /* 342 */ \
-  OP(GetShaderSource)                                          /* 343 */ \
-  OP(GetString)                                                /* 344 */ \
-  OP(GetTexParameterfv)                                        /* 345 */ \
-  OP(GetTexParameteriv)                                        /* 346 */ \
-  OP(GetUniformfv)                                             /* 347 */ \
-  OP(GetUniformiv)                                             /* 348 */ \
-  OP(GetUniformLocation)                                       /* 349 */ \
-  OP(GetUniformLocationImmediate)                              /* 350 */ \
-  OP(GetUniformLocationBucket)                                 /* 351 */ \
-  OP(GetVertexAttribfv)                                        /* 352 */ \
-  OP(GetVertexAttribiv)                                        /* 353 */ \
-  OP(GetVertexAttribPointerv)                                  /* 354 */ \
-  OP(Hint)                                                     /* 355 */ \
-  OP(IsBuffer)                                                 /* 356 */ \
-  OP(IsEnabled)                                                /* 357 */ \
-  OP(IsFramebuffer)                                            /* 358 */ \
-  OP(IsProgram)                                                /* 359 */ \
-  OP(IsRenderbuffer)                                           /* 360 */ \
-  OP(IsShader)                                                 /* 361 */ \
-  OP(IsTexture)                                                /* 362 */ \
-  OP(LineWidth)                                                /* 363 */ \
-  OP(LinkProgram)                                              /* 364 */ \
-  OP(PixelStorei)                                              /* 365 */ \
-  OP(PolygonOffset)                                            /* 366 */ \
-  OP(ReadPixels)                                               /* 367 */ \
-  OP(ReleaseShaderCompiler)                                    /* 368 */ \
-  OP(RenderbufferStorage)                                      /* 369 */ \
-  OP(SampleCoverage)                                           /* 370 */ \
-  OP(Scissor)                                                  /* 371 */ \
-  OP(ShaderBinary)                                             /* 372 */ \
-  OP(ShaderSource)                                             /* 373 */ \
-  OP(ShaderSourceImmediate)                                    /* 374 */ \
-  OP(ShaderSourceBucket)                                       /* 375 */ \
-  OP(StencilFunc)                                              /* 376 */ \
-  OP(StencilFuncSeparate)                                      /* 377 */ \
-  OP(StencilMask)                                              /* 378 */ \
-  OP(StencilMaskSeparate)                                      /* 379 */ \
-  OP(StencilOp)                                                /* 380 */ \
-  OP(StencilOpSeparate)                                        /* 381 */ \
-  OP(TexImage2D)                                               /* 382 */ \
-  OP(TexParameterf)                                            /* 383 */ \
-  OP(TexParameterfv)                                           /* 384 */ \
-  OP(TexParameterfvImmediate)                                  /* 385 */ \
-  OP(TexParameteri)                                            /* 386 */ \
-  OP(TexParameteriv)                                           /* 387 */ \
-  OP(TexParameterivImmediate)                                  /* 388 */ \
-  OP(TexSubImage2D)                                            /* 389 */ \
-  OP(Uniform1f)                                                /* 390 */ \
-  OP(Uniform1fv)                                               /* 391 */ \
-  OP(Uniform1fvImmediate)                                      /* 392 */ \
-  OP(Uniform1i)                                                /* 393 */ \
-  OP(Uniform1iv)                                               /* 394 */ \
-  OP(Uniform1ivImmediate)                                      /* 395 */ \
-  OP(Uniform2f)                                                /* 396 */ \
-  OP(Uniform2fv)                                               /* 397 */ \
-  OP(Uniform2fvImmediate)                                      /* 398 */ \
-  OP(Uniform2i)                                                /* 399 */ \
-  OP(Uniform2iv)                                               /* 400 */ \
-  OP(Uniform2ivImmediate)                                      /* 401 */ \
-  OP(Uniform3f)                                                /* 402 */ \
-  OP(Uniform3fv)                                               /* 403 */ \
-  OP(Uniform3fvImmediate)                                      /* 404 */ \
-  OP(Uniform3i)                                                /* 405 */ \
-  OP(Uniform3iv)                                               /* 406 */ \
-  OP(Uniform3ivImmediate)                                      /* 407 */ \
-  OP(Uniform4f)                                                /* 408 */ \
-  OP(Uniform4fv)                                               /* 409 */ \
-  OP(Uniform4fvImmediate)                                      /* 410 */ \
-  OP(Uniform4i)                                                /* 411 */ \
-  OP(Uniform4iv)                                               /* 412 */ \
-  OP(Uniform4ivImmediate)                                      /* 413 */ \
-  OP(UniformMatrix2fv)                                         /* 414 */ \
-  OP(UniformMatrix2fvImmediate)                                /* 415 */ \
-  OP(UniformMatrix3fv)                                         /* 416 */ \
-  OP(UniformMatrix3fvImmediate)                                /* 417 */ \
-  OP(UniformMatrix4fv)                                         /* 418 */ \
-  OP(UniformMatrix4fvImmediate)                                /* 419 */ \
-  OP(UseProgram)                                               /* 420 */ \
-  OP(ValidateProgram)                                          /* 421 */ \
-  OP(VertexAttrib1f)                                           /* 422 */ \
-  OP(VertexAttrib1fv)                                          /* 423 */ \
-  OP(VertexAttrib1fvImmediate)                                 /* 424 */ \
-  OP(VertexAttrib2f)                                           /* 425 */ \
-  OP(VertexAttrib2fv)                                          /* 426 */ \
-  OP(VertexAttrib2fvImmediate)                                 /* 427 */ \
-  OP(VertexAttrib3f)                                           /* 428 */ \
-  OP(VertexAttrib3fv)                                          /* 429 */ \
-  OP(VertexAttrib3fvImmediate)                                 /* 430 */ \
-  OP(VertexAttrib4f)                                           /* 431 */ \
-  OP(VertexAttrib4fv)                                          /* 432 */ \
-  OP(VertexAttrib4fvImmediate)                                 /* 433 */ \
-  OP(VertexAttribPointer)                                      /* 434 */ \
-  OP(Viewport)                                                 /* 435 */ \
-  OP(BlitFramebufferEXT)                                       /* 436 */ \
-  OP(RenderbufferStorageMultisampleEXT)                        /* 437 */ \
-  OP(FramebufferTexture2DMultisampleEXT)                       /* 438 */ \
-  OP(TexStorage2DEXT)                                          /* 439 */ \
-  OP(GenQueriesEXT)                                            /* 440 */ \
-  OP(GenQueriesEXTImmediate)                                   /* 441 */ \
-  OP(DeleteQueriesEXT)                                         /* 442 */ \
-  OP(DeleteQueriesEXTImmediate)                                /* 443 */ \
-  OP(BeginQueryEXT)                                            /* 444 */ \
-  OP(EndQueryEXT)                                              /* 445 */ \
-  OP(InsertEventMarkerEXT)                                     /* 446 */ \
-  OP(PushGroupMarkerEXT)                                       /* 447 */ \
-  OP(PopGroupMarkerEXT)                                        /* 448 */ \
-  OP(GenVertexArraysOES)                                       /* 449 */ \
-  OP(GenVertexArraysOESImmediate)                              /* 450 */ \
-  OP(DeleteVertexArraysOES)                                    /* 451 */ \
-  OP(DeleteVertexArraysOESImmediate)                           /* 452 */ \
-  OP(IsVertexArrayOES)                                         /* 453 */ \
-  OP(BindVertexArrayOES)                                       /* 454 */ \
-  OP(SwapBuffers)                                              /* 455 */ \
-  OP(GetMaxValueInBufferCHROMIUM)                              /* 456 */ \
-  OP(GenSharedIdsCHROMIUM)                                     /* 457 */ \
-  OP(DeleteSharedIdsCHROMIUM)                                  /* 458 */ \
-  OP(RegisterSharedIdsCHROMIUM)                                /* 459 */ \
-  OP(EnableFeatureCHROMIUM)                                    /* 460 */ \
-  OP(ResizeCHROMIUM)                                           /* 461 */ \
-  OP(GetRequestableExtensionsCHROMIUM)                         /* 462 */ \
-  OP(RequestExtensionCHROMIUM)                                 /* 463 */ \
-  OP(GetMultipleIntegervCHROMIUM)                              /* 464 */ \
-  OP(GetProgramInfoCHROMIUM)                                   /* 465 */ \
-  OP(CreateStreamTextureCHROMIUM)                              /* 466 */ \
-  OP(DestroyStreamTextureCHROMIUM)                             /* 467 */ \
-  OP(GetTranslatedShaderSourceANGLE)                           /* 468 */ \
-  OP(PostSubBufferCHROMIUM)                                    /* 469 */ \
-  OP(TexImageIOSurface2DCHROMIUM)                              /* 470 */ \
-  OP(CopyTextureCHROMIUM)                                      /* 471 */ \
-  OP(DrawArraysInstancedANGLE)                                 /* 472 */ \
-  OP(DrawElementsInstancedANGLE)                               /* 473 */ \
-  OP(VertexAttribDivisorANGLE)                                 /* 474 */ \
-  OP(GenMailboxCHROMIUM)                                       /* 475 */ \
-  OP(ProduceTextureCHROMIUM)                                   /* 476 */ \
-  OP(ProduceTextureCHROMIUMImmediate)                          /* 477 */ \
-  OP(ConsumeTextureCHROMIUM)                                   /* 478 */ \
-  OP(ConsumeTextureCHROMIUMImmediate)                          /* 479 */ \
-  OP(BindUniformLocationCHROMIUM)                              /* 480 */ \
-  OP(BindUniformLocationCHROMIUMImmediate)                     /* 481 */ \
-  OP(BindUniformLocationCHROMIUMBucket)                        /* 482 */ \
-  OP(BindTexImage2DCHROMIUM)                                   /* 483 */ \
-  OP(ReleaseTexImage2DCHROMIUM)                                /* 484 */ \
-  OP(TraceBeginCHROMIUM)                                       /* 485 */ \
-  OP(TraceEndCHROMIUM)                                         /* 486 */ \
-  OP(AsyncTexSubImage2DCHROMIUM)                               /* 487 */ \
-  OP(AsyncTexImage2DCHROMIUM)                                  /* 488 */ \
-  OP(WaitAsyncTexImage2DCHROMIUM)                              /* 489 */ \
-  OP(DiscardFramebufferEXT)                                    /* 490 */ \
-  OP(DiscardFramebufferEXTImmediate)                           /* 491 */ \
-  OP(LoseContextCHROMIUM)                                      /* 492 */ \
-  OP(InsertSyncPointCHROMIUM)                                  /* 493 */ \
-  OP(WaitSyncPointCHROMIUM)                                    /* 494 */ \
-  OP(DrawBuffersEXT)                                           /* 495 */ \
-  OP(DrawBuffersEXTImmediate)                                  /* 496 */ \
+  OP(GetAttribLocationBucket)                                  /* 329 */ \
+  OP(GetBooleanv)                                              /* 330 */ \
+  OP(GetBufferParameteriv)                                     /* 331 */ \
+  OP(GetError)                                                 /* 332 */ \
+  OP(GetFloatv)                                                /* 333 */ \
+  OP(GetFramebufferAttachmentParameteriv)                      /* 334 */ \
+  OP(GetIntegerv)                                              /* 335 */ \
+  OP(GetProgramiv)                                             /* 336 */ \
+  OP(GetProgramInfoLog)                                        /* 337 */ \
+  OP(GetRenderbufferParameteriv)                               /* 338 */ \
+  OP(GetShaderiv)                                              /* 339 */ \
+  OP(GetShaderInfoLog)                                         /* 340 */ \
+  OP(GetShaderPrecisionFormat)                                 /* 341 */ \
+  OP(GetShaderSource)                                          /* 342 */ \
+  OP(GetString)                                                /* 343 */ \
+  OP(GetTexParameterfv)                                        /* 344 */ \
+  OP(GetTexParameteriv)                                        /* 345 */ \
+  OP(GetUniformfv)                                             /* 346 */ \
+  OP(GetUniformiv)                                             /* 347 */ \
+  OP(GetUniformLocation)                                       /* 348 */ \
+  OP(GetUniformLocationBucket)                                 /* 349 */ \
+  OP(GetVertexAttribfv)                                        /* 350 */ \
+  OP(GetVertexAttribiv)                                        /* 351 */ \
+  OP(GetVertexAttribPointerv)                                  /* 352 */ \
+  OP(Hint)                                                     /* 353 */ \
+  OP(IsBuffer)                                                 /* 354 */ \
+  OP(IsEnabled)                                                /* 355 */ \
+  OP(IsFramebuffer)                                            /* 356 */ \
+  OP(IsProgram)                                                /* 357 */ \
+  OP(IsRenderbuffer)                                           /* 358 */ \
+  OP(IsShader)                                                 /* 359 */ \
+  OP(IsTexture)                                                /* 360 */ \
+  OP(LineWidth)                                                /* 361 */ \
+  OP(LinkProgram)                                              /* 362 */ \
+  OP(PixelStorei)                                              /* 363 */ \
+  OP(PolygonOffset)                                            /* 364 */ \
+  OP(ReadPixels)                                               /* 365 */ \
+  OP(ReleaseShaderCompiler)                                    /* 366 */ \
+  OP(RenderbufferStorage)                                      /* 367 */ \
+  OP(SampleCoverage)                                           /* 368 */ \
+  OP(Scissor)                                                  /* 369 */ \
+  OP(ShaderBinary)                                             /* 370 */ \
+  OP(ShaderSource)                                             /* 371 */ \
+  OP(ShaderSourceImmediate)                                    /* 372 */ \
+  OP(ShaderSourceBucket)                                       /* 373 */ \
+  OP(StencilFunc)                                              /* 374 */ \
+  OP(StencilFuncSeparate)                                      /* 375 */ \
+  OP(StencilMask)                                              /* 376 */ \
+  OP(StencilMaskSeparate)                                      /* 377 */ \
+  OP(StencilOp)                                                /* 378 */ \
+  OP(StencilOpSeparate)                                        /* 379 */ \
+  OP(TexImage2D)                                               /* 380 */ \
+  OP(TexParameterf)                                            /* 381 */ \
+  OP(TexParameterfv)                                           /* 382 */ \
+  OP(TexParameterfvImmediate)                                  /* 383 */ \
+  OP(TexParameteri)                                            /* 384 */ \
+  OP(TexParameteriv)                                           /* 385 */ \
+  OP(TexParameterivImmediate)                                  /* 386 */ \
+  OP(TexSubImage2D)                                            /* 387 */ \
+  OP(Uniform1f)                                                /* 388 */ \
+  OP(Uniform1fv)                                               /* 389 */ \
+  OP(Uniform1fvImmediate)                                      /* 390 */ \
+  OP(Uniform1i)                                                /* 391 */ \
+  OP(Uniform1iv)                                               /* 392 */ \
+  OP(Uniform1ivImmediate)                                      /* 393 */ \
+  OP(Uniform2f)                                                /* 394 */ \
+  OP(Uniform2fv)                                               /* 395 */ \
+  OP(Uniform2fvImmediate)                                      /* 396 */ \
+  OP(Uniform2i)                                                /* 397 */ \
+  OP(Uniform2iv)                                               /* 398 */ \
+  OP(Uniform2ivImmediate)                                      /* 399 */ \
+  OP(Uniform3f)                                                /* 400 */ \
+  OP(Uniform3fv)                                               /* 401 */ \
+  OP(Uniform3fvImmediate)                                      /* 402 */ \
+  OP(Uniform3i)                                                /* 403 */ \
+  OP(Uniform3iv)                                               /* 404 */ \
+  OP(Uniform3ivImmediate)                                      /* 405 */ \
+  OP(Uniform4f)                                                /* 406 */ \
+  OP(Uniform4fv)                                               /* 407 */ \
+  OP(Uniform4fvImmediate)                                      /* 408 */ \
+  OP(Uniform4i)                                                /* 409 */ \
+  OP(Uniform4iv)                                               /* 410 */ \
+  OP(Uniform4ivImmediate)                                      /* 411 */ \
+  OP(UniformMatrix2fv)                                         /* 412 */ \
+  OP(UniformMatrix2fvImmediate)                                /* 413 */ \
+  OP(UniformMatrix3fv)                                         /* 414 */ \
+  OP(UniformMatrix3fvImmediate)                                /* 415 */ \
+  OP(UniformMatrix4fv)                                         /* 416 */ \
+  OP(UniformMatrix4fvImmediate)                                /* 417 */ \
+  OP(UseProgram)                                               /* 418 */ \
+  OP(ValidateProgram)                                          /* 419 */ \
+  OP(VertexAttrib1f)                                           /* 420 */ \
+  OP(VertexAttrib1fv)                                          /* 421 */ \
+  OP(VertexAttrib1fvImmediate)                                 /* 422 */ \
+  OP(VertexAttrib2f)                                           /* 423 */ \
+  OP(VertexAttrib2fv)                                          /* 424 */ \
+  OP(VertexAttrib2fvImmediate)                                 /* 425 */ \
+  OP(VertexAttrib3f)                                           /* 426 */ \
+  OP(VertexAttrib3fv)                                          /* 427 */ \
+  OP(VertexAttrib3fvImmediate)                                 /* 428 */ \
+  OP(VertexAttrib4f)                                           /* 429 */ \
+  OP(VertexAttrib4fv)                                          /* 430 */ \
+  OP(VertexAttrib4fvImmediate)                                 /* 431 */ \
+  OP(VertexAttribPointer)                                      /* 432 */ \
+  OP(Viewport)                                                 /* 433 */ \
+  OP(BlitFramebufferEXT)                                       /* 434 */ \
+  OP(RenderbufferStorageMultisampleEXT)                        /* 435 */ \
+  OP(FramebufferTexture2DMultisampleEXT)                       /* 436 */ \
+  OP(TexStorage2DEXT)                                          /* 437 */ \
+  OP(GenQueriesEXT)                                            /* 438 */ \
+  OP(GenQueriesEXTImmediate)                                   /* 439 */ \
+  OP(DeleteQueriesEXT)                                         /* 440 */ \
+  OP(DeleteQueriesEXTImmediate)                                /* 441 */ \
+  OP(BeginQueryEXT)                                            /* 442 */ \
+  OP(EndQueryEXT)                                              /* 443 */ \
+  OP(InsertEventMarkerEXT)                                     /* 444 */ \
+  OP(PushGroupMarkerEXT)                                       /* 445 */ \
+  OP(PopGroupMarkerEXT)                                        /* 446 */ \
+  OP(GenVertexArraysOES)                                       /* 447 */ \
+  OP(GenVertexArraysOESImmediate)                              /* 448 */ \
+  OP(DeleteVertexArraysOES)                                    /* 449 */ \
+  OP(DeleteVertexArraysOESImmediate)                           /* 450 */ \
+  OP(IsVertexArrayOES)                                         /* 451 */ \
+  OP(BindVertexArrayOES)                                       /* 452 */ \
+  OP(SwapBuffers)                                              /* 453 */ \
+  OP(GetMaxValueInBufferCHROMIUM)                              /* 454 */ \
+  OP(GenSharedIdsCHROMIUM)                                     /* 455 */ \
+  OP(DeleteSharedIdsCHROMIUM)                                  /* 456 */ \
+  OP(RegisterSharedIdsCHROMIUM)                                /* 457 */ \
+  OP(EnableFeatureCHROMIUM)                                    /* 458 */ \
+  OP(ResizeCHROMIUM)                                           /* 459 */ \
+  OP(GetRequestableExtensionsCHROMIUM)                         /* 460 */ \
+  OP(RequestExtensionCHROMIUM)                                 /* 461 */ \
+  OP(GetMultipleIntegervCHROMIUM)                              /* 462 */ \
+  OP(GetProgramInfoCHROMIUM)                                   /* 463 */ \
+  OP(CreateStreamTextureCHROMIUM)                              /* 464 */ \
+  OP(DestroyStreamTextureCHROMIUM)                             /* 465 */ \
+  OP(GetTranslatedShaderSourceANGLE)                           /* 466 */ \
+  OP(PostSubBufferCHROMIUM)                                    /* 467 */ \
+  OP(TexImageIOSurface2DCHROMIUM)                              /* 468 */ \
+  OP(CopyTextureCHROMIUM)                                      /* 469 */ \
+  OP(DrawArraysInstancedANGLE)                                 /* 470 */ \
+  OP(DrawElementsInstancedANGLE)                               /* 471 */ \
+  OP(VertexAttribDivisorANGLE)                                 /* 472 */ \
+  OP(GenMailboxCHROMIUM)                                       /* 473 */ \
+  OP(ProduceTextureCHROMIUM)                                   /* 474 */ \
+  OP(ProduceTextureCHROMIUMImmediate)                          /* 475 */ \
+  OP(ConsumeTextureCHROMIUM)                                   /* 476 */ \
+  OP(ConsumeTextureCHROMIUMImmediate)                          /* 477 */ \
+  OP(BindUniformLocationCHROMIUM)                              /* 478 */ \
+  OP(BindUniformLocationCHROMIUMImmediate)                     /* 479 */ \
+  OP(BindUniformLocationCHROMIUMBucket)                        /* 480 */ \
+  OP(BindTexImage2DCHROMIUM)                                   /* 481 */ \
+  OP(ReleaseTexImage2DCHROMIUM)                                /* 482 */ \
+  OP(TraceBeginCHROMIUM)                                       /* 483 */ \
+  OP(TraceEndCHROMIUM)                                         /* 484 */ \
+  OP(AsyncTexSubImage2DCHROMIUM)                               /* 485 */ \
+  OP(AsyncTexImage2DCHROMIUM)                                  /* 486 */ \
+  OP(WaitAsyncTexImage2DCHROMIUM)                              /* 487 */ \
+  OP(DiscardFramebufferEXT)                                    /* 488 */ \
+  OP(DiscardFramebufferEXTImmediate)                           /* 489 */ \
+  OP(LoseContextCHROMIUM)                                      /* 490 */ \
+  OP(InsertSyncPointCHROMIUM)                                  /* 491 */ \
+  OP(WaitSyncPointCHROMIUM)                                    /* 492 */ \
+  OP(DrawBuffersEXT)                                           /* 493 */ \
+  OP(DrawBuffersEXTImmediate)                                  /* 494 */ \
 
 enum CommandId {
   kStartPoint = cmd::kLastCommonId,  // All GLES2 commands start after this.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 0a22d7d..eb8b6b4 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -7212,19 +7212,6 @@ error::Error GLES2DecoderImpl::HandleGetAttribLocation(
     c.program, c.location_shm_id, c.location_shm_offset, name_str);
 }
 
-error::Error GLES2DecoderImpl::HandleGetAttribLocationImmediate(
-    uint32 immediate_data_size, const cmds::GetAttribLocationImmediate& c) {
-  uint32 name_size = c.data_size;
-  const char* name = GetImmediateDataAs<const char*>(
-      c, name_size, immediate_data_size);
-  if (!name) {
-    return error::kOutOfBounds;
-  }
-  String name_str(name, name_size);
-  return GetAttribLocationHelper(
-    c.program, c.location_shm_id, c.location_shm_offset, name_str);
-}
-
 error::Error GLES2DecoderImpl::HandleGetAttribLocationBucket(
     uint32 immediate_data_size, const cmds::GetAttribLocationBucket& c) {
   Bucket* bucket = GetBucket(c.name_bucket_id);
@@ -7284,19 +7271,6 @@ error::Error GLES2DecoderImpl::HandleGetUniformLocation(
     c.program, c.location_shm_id, c.location_shm_offset, name_str);
 }
 
-error::Error GLES2DecoderImpl::HandleGetUniformLocationImmediate(
-    uint32 immediate_data_size, const cmds::GetUniformLocationImmediate& c) {
-  uint32 name_size = c.data_size;
-  const char* name = GetImmediateDataAs<const char*>(
-      c, name_size, immediate_data_size);
-  if (!name) {
-    return error::kOutOfBounds;
-  }
-  String name_str(name, name_size);
-  return GetUniformLocationHelper(
-    c.program, c.location_shm_id, c.location_shm_offset, name_str);
-}
-
 error::Error GLES2DecoderImpl::HandleGetUniformLocationBucket(
     uint32 immediate_data_size, const cmds::GetUniformLocationBucket& c) {
   Bucket* bucket = GetBucket(c.name_bucket_id);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 05d0759..f16c487 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -2708,49 +2708,6 @@ TEST_F(GLES2DecoderWithShaderTest, GetAttribLocationInvalidArgs) {
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 
-TEST_F(GLES2DecoderWithShaderTest, GetAttribLocationImmediate) {
-  const uint32 kNameSize = strlen(kAttrib2Name);
-  const char* kNonExistentName = "foobar";
-  const uint32 kNonExistentNameSize = strlen(kNonExistentName);
-  typedef GetAttribLocationImmediate::Result Result;
-  Result* result = GetSharedMemoryAs<Result*>();
-  *result = -1;
-  GetAttribLocationImmediate& cmd =
-      *GetImmediateAs<GetAttribLocationImmediate>();
-  cmd.Init(client_program_id_, kAttrib2Name,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(kAttrib2Location, *result);
-  *result = -1;
-  cmd.Init(client_program_id_, kNonExistentName,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNonExistentNameSize));
-  EXPECT_EQ(-1, *result);
-}
-
-TEST_F(GLES2DecoderWithShaderTest, GetAttribLocationImmediateInvalidArgs) {
-  const uint32 kNameSize = strlen(kAttrib2Name);
-  typedef GetAttribLocationImmediate::Result Result;
-  Result* result = GetSharedMemoryAs<Result*>();
-  *result = -1;
-  GetAttribLocationImmediate& cmd =
-      *GetImmediateAs<GetAttribLocationImmediate>();
-  cmd.Init(kInvalidClientId, kAttrib2Name,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-  *result = -1;
-  cmd.Init(client_program_id_, kAttrib2Name,
-           kInvalidSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-  cmd.Init(client_program_id_, kAttrib2Name,
-           kSharedMemoryId, kInvalidSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-}
-
 TEST_F(GLES2DecoderWithShaderTest, GetAttribLocationBucket) {
   const uint32 kBucketId = 123;
   const char* kNonExistentName = "foobar";
@@ -2884,49 +2841,6 @@ TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationInvalidArgs) {
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 
-TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationImmediate) {
-  const uint32 kNameSize = strlen(kUniform2Name);
-  const char* kNonExistentName = "foobar";
-  const uint32 kNonExistentNameSize = strlen(kNonExistentName);
-  typedef GetUniformLocationImmediate::Result Result;
-  Result* result = GetSharedMemoryAs<Result*>();
-  *result = -1;
-  GetUniformLocationImmediate& cmd =
-      *GetImmediateAs<GetUniformLocationImmediate>();
-  cmd.Init(client_program_id_, kUniform2Name,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(kUniform2FakeLocation, *result);
-  *result = -1;
-  cmd.Init(client_program_id_, kNonExistentName,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNonExistentNameSize));
-  EXPECT_EQ(-1, *result);
-}
-
-TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationImmediateInvalidArgs) {
-  const uint32 kNameSize = strlen(kUniform2Name);
-  typedef GetUniformLocationImmediate::Result Result;
-  Result* result = GetSharedMemoryAs<Result*>();
-  *result = -1;
-  GetUniformLocationImmediate& cmd =
-      *GetImmediateAs<GetUniformLocationImmediate>();
-  cmd.Init(kInvalidClientId, kUniform2Name,
-           kSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-  EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
-  *result = -1;
-  cmd.Init(client_program_id_, kUniform2Name,
-           kInvalidSharedMemoryId, kSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-  cmd.Init(client_program_id_, kUniform2Name,
-           kSharedMemoryId, kInvalidSharedMemoryOffset);
-  EXPECT_NE(error::kNoError, ExecuteImmediateCmd(cmd, kNameSize));
-  EXPECT_EQ(-1, *result);
-}
-
 TEST_F(GLES2DecoderWithShaderTest, GetUniformLocationBucket) {
   const uint32 kBucketId = 123;
   const char* kNonExistentName = "foobar";
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
index 8076743..1c0aa95 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
@@ -1108,8 +1108,6 @@ TEST_F(GLES2DecoderTest1, GenTexturesImmediateInvalidArgs) {
 
 // TODO(gman): GetAttribLocation
 
-// TODO(gman): GetAttribLocationImmediate
-
 // TODO(gman): GetAttribLocationBucket
 
 
@@ -1817,8 +1815,6 @@ TEST_F(GLES2DecoderTest1, GetTexParameterivInvalidArgs2_1) {
 
 // TODO(gman): GetUniformLocation
 
-// TODO(gman): GetUniformLocationImmediate
-
 // TODO(gman): GetUniformLocationBucket
 
 
@@ -1905,5 +1901,25 @@ TEST_F(GLES2DecoderTest1, GetVertexAttribivInvalidArgs2_1) {
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   EXPECT_EQ(0u, result->size);
 }
+// TODO(gman): GetVertexAttribPointerv
+
+
+TEST_F(GLES2DecoderTest1, HintValidArgs) {
+  EXPECT_CALL(*gl_, Hint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST));
+  SpecializedSetup<cmds::Hint, 0>(true);
+  cmds::Hint cmd;
+  cmd.Init(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+  EXPECT_EQ(GL_NO_ERROR, GetGLError());
+}
+
+TEST_F(GLES2DecoderTest1, HintInvalidArgs0_0) {
+  EXPECT_CALL(*gl_, Hint(_, _)).Times(0);
+  SpecializedSetup<cmds::Hint, 0>(false);
+  cmds::Hint cmd;
+  cmd.Init(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+  EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
+}
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
 
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 142514c..21362ef 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
@@ -10,26 +10,6 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
 
-// TODO(gman): GetVertexAttribPointerv
-
-
-TEST_F(GLES2DecoderTest2, HintValidArgs) {
-  EXPECT_CALL(*gl_, Hint(GL_GENERATE_MIPMAP_HINT, GL_FASTEST));
-  SpecializedSetup<cmds::Hint, 0>(true);
-  cmds::Hint cmd;
-  cmd.Init(GL_GENERATE_MIPMAP_HINT, GL_FASTEST);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_F(GLES2DecoderTest2, HintInvalidArgs0_0) {
-  EXPECT_CALL(*gl_, Hint(_, _)).Times(0);
-  SpecializedSetup<cmds::Hint, 0>(false);
-  cmds::Hint cmd;
-  cmd.Init(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-  EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
-  EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
-}
 
 TEST_F(GLES2DecoderTest2, IsBufferValidArgs) {
   SpecializedSetup<cmds::IsBuffer, 0>(true);
@@ -1720,5 +1700,7 @@ TEST_F(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) {
 // TODO(gman): GenVertexArraysOES
 // TODO(gman): GenVertexArraysOESImmediate
 // TODO(gman): DeleteVertexArraysOES
+// TODO(gman): DeleteVertexArraysOESImmediate
+// TODO(gman): IsVertexArrayOES
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
 
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 e361a3b..19efa9e 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
@@ -10,8 +10,6 @@
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_
 
-// TODO(gman): DeleteVertexArraysOESImmediate
-// TODO(gman): IsVertexArrayOES
 // TODO(gman): BindVertexArrayOES
 // TODO(gman): SwapBuffers
 // TODO(gman): GetMaxValueInBufferCHROMIUM