Merged in recent changes to command buffer code.

gpu/command_buffer/client/gles2_cmd_helper_autogen.h

   void ActiveTexture(GLenum texture) {
     gles2::ActiveTexture& c = GetCmdSpace<gles2::ActiveTexture>();
     c.Init(texture);
   }
 
   void AttachShader(GLuint program, GLuint shader) {
     gles2::AttachShader& c = GetCmdSpace<gles2::AttachShader>();
     c.Init(program, shader);
   }
 
@@ skipping 432 matching lines @@
   void GetAttachedShaders(
       GLuint program, GLsizei maxcount, uint32 count_shm_id,
       uint32 count_shm_offset, uint32 shaders_shm_id,
       uint32 shaders_shm_offset) {
     gles2::GetAttachedShaders& c = GetCmdSpace<gles2::GetAttachedShaders>();
     c.Init(
         program, maxcount, count_shm_id, count_shm_offset, shaders_shm_id,
         shaders_shm_offset);
   }
 
-  void GetAttribLocation(
-      GLuint program, uint32 name_shm_id, uint32 name_shm_offset,
-      uint32 data_size) {
-    gles2::GetAttribLocation& c = GetCmdSpace<gles2::GetAttribLocation>();
-    c.Init(program, name_shm_id, name_shm_offset, data_size);
-  }
-
-  void GetAttribLocationImmediate(GLuint program, const char* name) {
-    const uint32 size = gles2::GetAttribLocationImmediate::ComputeSize(name);
-    gles2::GetAttribLocationImmediate& c =
-        GetImmediateCmdSpaceTotalSize<gles2::GetAttribLocationImmediate>(size);
-    c.Init(program, name);
-  }
-
   void GetBooleanv(
       GLenum pname, uint32 params_shm_id, uint32 params_shm_offset) {
     gles2::GetBooleanv& c = GetCmdSpace<gles2::GetBooleanv>();
     c.Init(pname, params_shm_id, params_shm_offset);
   }
 
   void GetBufferParameteriv(
       GLenum target, GLenum pname, uint32 params_shm_id,
       uint32 params_shm_offset) {
     gles2::GetBufferParameteriv& c =
@@ skipping 115 matching lines @@
     c.Init(program, location, params_shm_id, params_shm_offset);
   }
 
   void GetUniformiv(
       GLuint program, GLint location, uint32 params_shm_id,
       uint32 params_shm_offset) {
     gles2::GetUniformiv& c = GetCmdSpace<gles2::GetUniformiv>();
     c.Init(program, location, params_shm_id, params_shm_offset);
   }
 
-  void GetUniformLocation(
-      GLuint program, uint32 name_shm_id, uint32 name_shm_offset,
-      uint32 data_size) {
-    gles2::GetUniformLocation& c = GetCmdSpace<gles2::GetUniformLocation>();
-    c.Init(program, name_shm_id, name_shm_offset, data_size);
-  }
-
-  void GetUniformLocationImmediate(GLuint program, const char* name) {
-    const uint32 size = gles2::GetUniformLocationImmediate::ComputeSize(name);
-    gles2::GetUniformLocationImmediate& c =
-        GetImmediateCmdSpaceTotalSize<gles2::GetUniformLocationImmediate>(
-            size);
-    c.Init(program, name);
-  }
-
   void GetVertexAttribfv(
       GLuint index, GLenum pname, uint32 params_shm_id,
       uint32 params_shm_offset) {
     gles2::GetVertexAttribfv& c = GetCmdSpace<gles2::GetVertexAttribfv>();
     c.Init(index, pname, params_shm_id, params_shm_offset);
   }
 
   void GetVertexAttribiv(
       GLuint index, GLenum pname, uint32 params_shm_id,
       uint32 params_shm_offset) {
@@ skipping 507 matching lines @@
   void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
     gles2::Viewport& c = GetCmdSpace<gles2::Viewport>();
     c.Init(x, y, width, height);
   }
 
   void SwapBuffers() {
     gles2::SwapBuffers& c = GetCmdSpace<gles2::SwapBuffers>();
     c.Init();
   }