| Index: gpu/command_buffer/common/gles2_cmd_format_autogen.h
 | 
| diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
 | 
| index 12b90c9c7be1a7c774491ffc2635484d6023f230..cb88581d074c56948854ef4471b1b209ccc8e67e 100644
 | 
| --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
 | 
| +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
 | 
| @@ -3374,6 +3374,68 @@ static_assert(offsetof(GetActiveUniform::Result, type) == 8,
 | 
|                "offset of GetActiveUniform Result type should be "
 | 
|                "8");
 | 
|  
 | 
| +struct GetActiveUniformBlockiv {
 | 
| +  typedef GetActiveUniformBlockiv ValueType;
 | 
| +  static const CommandId kCmdId = kGetActiveUniformBlockiv;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  typedef SizedResult<GLint> Result;
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program,
 | 
| +            GLuint _index,
 | 
| +            GLenum _pname,
 | 
| +            uint32_t _params_shm_id,
 | 
| +            uint32_t _params_shm_offset) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    index = _index;
 | 
| +    pname = _pname;
 | 
| +    params_shm_id = _params_shm_id;
 | 
| +    params_shm_offset = _params_shm_offset;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd,
 | 
| +            GLuint _program,
 | 
| +            GLuint _index,
 | 
| +            GLenum _pname,
 | 
| +            uint32_t _params_shm_id,
 | 
| +            uint32_t _params_shm_offset) {
 | 
| +    static_cast<ValueType*>(cmd)
 | 
| +        ->Init(_program, _index, _pname, _params_shm_id, _params_shm_offset);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t index;
 | 
| +  uint32_t pname;
 | 
| +  uint32_t params_shm_id;
 | 
| +  uint32_t params_shm_offset;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetActiveUniformBlockiv) == 24,
 | 
| +              "size of GetActiveUniformBlockiv should be 24");
 | 
| +static_assert(offsetof(GetActiveUniformBlockiv, header) == 0,
 | 
| +              "offset of GetActiveUniformBlockiv header should be 0");
 | 
| +static_assert(offsetof(GetActiveUniformBlockiv, program) == 4,
 | 
| +              "offset of GetActiveUniformBlockiv program should be 4");
 | 
| +static_assert(offsetof(GetActiveUniformBlockiv, index) == 8,
 | 
| +              "offset of GetActiveUniformBlockiv index should be 8");
 | 
| +static_assert(offsetof(GetActiveUniformBlockiv, pname) == 12,
 | 
| +              "offset of GetActiveUniformBlockiv pname should be 12");
 | 
| +static_assert(offsetof(GetActiveUniformBlockiv, params_shm_id) == 16,
 | 
| +              "offset of GetActiveUniformBlockiv params_shm_id should be 16");
 | 
| +static_assert(
 | 
| +    offsetof(GetActiveUniformBlockiv, params_shm_offset) == 20,
 | 
| +    "offset of GetActiveUniformBlockiv params_shm_offset should be 20");
 | 
| +
 | 
|  struct GetActiveUniformBlockName {
 | 
|    typedef GetActiveUniformBlockName ValueType;
 | 
|    static const CommandId kCmdId = kGetActiveUniformBlockName;
 | 
| @@ -3437,6 +3499,67 @@ static_assert(
 | 
|      offsetof(GetActiveUniformBlockName, result_shm_offset) == 20,
 | 
|      "offset of GetActiveUniformBlockName result_shm_offset should be 20");
 | 
|  
 | 
| +struct GetActiveUniformsiv {
 | 
| +  typedef GetActiveUniformsiv ValueType;
 | 
| +  static const CommandId kCmdId = kGetActiveUniformsiv;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  typedef SizedResult<GLint> Result;
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program,
 | 
| +            uint32_t _indices_bucket_id,
 | 
| +            GLenum _pname,
 | 
| +            uint32_t _params_shm_id,
 | 
| +            uint32_t _params_shm_offset) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    indices_bucket_id = _indices_bucket_id;
 | 
| +    pname = _pname;
 | 
| +    params_shm_id = _params_shm_id;
 | 
| +    params_shm_offset = _params_shm_offset;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd,
 | 
| +            GLuint _program,
 | 
| +            uint32_t _indices_bucket_id,
 | 
| +            GLenum _pname,
 | 
| +            uint32_t _params_shm_id,
 | 
| +            uint32_t _params_shm_offset) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _indices_bucket_id, _pname,
 | 
| +                                       _params_shm_id, _params_shm_offset);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t indices_bucket_id;
 | 
| +  uint32_t pname;
 | 
| +  uint32_t params_shm_id;
 | 
| +  uint32_t params_shm_offset;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetActiveUniformsiv) == 24,
 | 
| +              "size of GetActiveUniformsiv should be 24");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, header) == 0,
 | 
| +              "offset of GetActiveUniformsiv header should be 0");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, program) == 4,
 | 
| +              "offset of GetActiveUniformsiv program should be 4");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, indices_bucket_id) == 8,
 | 
| +              "offset of GetActiveUniformsiv indices_bucket_id should be 8");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, pname) == 12,
 | 
| +              "offset of GetActiveUniformsiv pname should be 12");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, params_shm_id) == 16,
 | 
| +              "offset of GetActiveUniformsiv params_shm_id should be 16");
 | 
| +static_assert(offsetof(GetActiveUniformsiv, params_shm_offset) == 20,
 | 
| +              "offset of GetActiveUniformsiv params_shm_offset should be 20");
 | 
| +
 | 
|  struct GetAttachedShaders {
 | 
|    typedef GetAttachedShaders ValueType;
 | 
|    static const CommandId kCmdId = kGetAttachedShaders;
 | 
| @@ -4579,6 +4702,83 @@ static_assert(offsetof(GetTexParameteriv, params_shm_id) == 12,
 | 
|  static_assert(offsetof(GetTexParameteriv, params_shm_offset) == 16,
 | 
|                "offset of GetTexParameteriv params_shm_offset should be 16");
 | 
|  
 | 
| +struct GetTransformFeedbackVarying {
 | 
| +  typedef GetTransformFeedbackVarying ValueType;
 | 
| +  static const CommandId kCmdId = kGetTransformFeedbackVarying;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  struct Result {
 | 
| +    int32_t success;
 | 
| +    int32_t size;
 | 
| +    uint32_t type;
 | 
| +  };
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program,
 | 
| +            GLuint _index,
 | 
| +            uint32_t _name_bucket_id,
 | 
| +            uint32_t _result_shm_id,
 | 
| +            uint32_t _result_shm_offset) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    index = _index;
 | 
| +    name_bucket_id = _name_bucket_id;
 | 
| +    result_shm_id = _result_shm_id;
 | 
| +    result_shm_offset = _result_shm_offset;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd,
 | 
| +            GLuint _program,
 | 
| +            GLuint _index,
 | 
| +            uint32_t _name_bucket_id,
 | 
| +            uint32_t _result_shm_id,
 | 
| +            uint32_t _result_shm_offset) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _index, _name_bucket_id,
 | 
| +                                       _result_shm_id, _result_shm_offset);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t index;
 | 
| +  uint32_t name_bucket_id;
 | 
| +  uint32_t result_shm_id;
 | 
| +  uint32_t result_shm_offset;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetTransformFeedbackVarying) == 24,
 | 
| +              "size of GetTransformFeedbackVarying should be 24");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying, header) == 0,
 | 
| +              "offset of GetTransformFeedbackVarying header should be 0");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying, program) == 4,
 | 
| +              "offset of GetTransformFeedbackVarying program should be 4");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying, index) == 8,
 | 
| +              "offset of GetTransformFeedbackVarying index should be 8");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVarying, name_bucket_id) == 12,
 | 
| +    "offset of GetTransformFeedbackVarying name_bucket_id should be 12");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVarying, result_shm_id) == 16,
 | 
| +    "offset of GetTransformFeedbackVarying result_shm_id should be 16");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVarying, result_shm_offset) == 20,
 | 
| +    "offset of GetTransformFeedbackVarying result_shm_offset should be 20");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying::Result, success) == 0,
 | 
| +              "offset of GetTransformFeedbackVarying Result success should be "
 | 
| +              "0");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying::Result, size) == 4,
 | 
| +              "offset of GetTransformFeedbackVarying Result size should be "
 | 
| +              "4");
 | 
| +static_assert(offsetof(GetTransformFeedbackVarying::Result, type) == 8,
 | 
| +              "offset of GetTransformFeedbackVarying Result type should be "
 | 
| +              "8");
 | 
| +
 | 
|  struct GetUniformBlockIndex {
 | 
|    typedef GetUniformBlockIndex ValueType;
 | 
|    static const CommandId kCmdId = kGetUniformBlockIndex;
 | 
| @@ -4742,6 +4942,61 @@ static_assert(offsetof(GetUniformiv, params_shm_id) == 12,
 | 
|  static_assert(offsetof(GetUniformiv, params_shm_offset) == 16,
 | 
|                "offset of GetUniformiv params_shm_offset should be 16");
 | 
|  
 | 
| +struct GetUniformIndices {
 | 
| +  typedef GetUniformIndices ValueType;
 | 
| +  static const CommandId kCmdId = kGetUniformIndices;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  typedef SizedResult<GLuint> Result;
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program,
 | 
| +            uint32_t _names_bucket_id,
 | 
| +            uint32_t _indices_shm_id,
 | 
| +            uint32_t _indices_shm_offset) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    names_bucket_id = _names_bucket_id;
 | 
| +    indices_shm_id = _indices_shm_id;
 | 
| +    indices_shm_offset = _indices_shm_offset;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd,
 | 
| +            GLuint _program,
 | 
| +            uint32_t _names_bucket_id,
 | 
| +            uint32_t _indices_shm_id,
 | 
| +            uint32_t _indices_shm_offset) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _names_bucket_id,
 | 
| +                                       _indices_shm_id, _indices_shm_offset);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t names_bucket_id;
 | 
| +  uint32_t indices_shm_id;
 | 
| +  uint32_t indices_shm_offset;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetUniformIndices) == 20,
 | 
| +              "size of GetUniformIndices should be 20");
 | 
| +static_assert(offsetof(GetUniformIndices, header) == 0,
 | 
| +              "offset of GetUniformIndices header should be 0");
 | 
| +static_assert(offsetof(GetUniformIndices, program) == 4,
 | 
| +              "offset of GetUniformIndices program should be 4");
 | 
| +static_assert(offsetof(GetUniformIndices, names_bucket_id) == 8,
 | 
| +              "offset of GetUniformIndices names_bucket_id should be 8");
 | 
| +static_assert(offsetof(GetUniformIndices, indices_shm_id) == 12,
 | 
| +              "offset of GetUniformIndices indices_shm_id should be 12");
 | 
| +static_assert(offsetof(GetUniformIndices, indices_shm_offset) == 16,
 | 
| +              "offset of GetUniformIndices indices_shm_offset should be 16");
 | 
| +
 | 
|  struct GetUniformLocation {
 | 
|    typedef GetUniformLocation ValueType;
 | 
|    static const CommandId kCmdId = kGetUniformLocation;
 | 
| @@ -8323,6 +8578,47 @@ static_assert(offsetof(Uniform4uivImmediate, location) == 4,
 | 
|  static_assert(offsetof(Uniform4uivImmediate, count) == 8,
 | 
|                "offset of Uniform4uivImmediate count should be 8");
 | 
|  
 | 
| +struct UniformBlockBinding {
 | 
| +  typedef UniformBlockBinding ValueType;
 | 
| +  static const CommandId kCmdId = kUniformBlockBinding;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program, GLuint _index, GLuint _binding) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    index = _index;
 | 
| +    binding = _binding;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd, GLuint _program, GLuint _index, GLuint _binding) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _index, _binding);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t index;
 | 
| +  uint32_t binding;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(UniformBlockBinding) == 16,
 | 
| +              "size of UniformBlockBinding should be 16");
 | 
| +static_assert(offsetof(UniformBlockBinding, header) == 0,
 | 
| +              "offset of UniformBlockBinding header should be 0");
 | 
| +static_assert(offsetof(UniformBlockBinding, program) == 4,
 | 
| +              "offset of UniformBlockBinding program should be 4");
 | 
| +static_assert(offsetof(UniformBlockBinding, index) == 8,
 | 
| +              "offset of UniformBlockBinding index should be 8");
 | 
| +static_assert(offsetof(UniformBlockBinding, binding) == 12,
 | 
| +              "offset of UniformBlockBinding binding should be 12");
 | 
| +
 | 
|  struct UniformMatrix2fvImmediate {
 | 
|    typedef UniformMatrix2fvImmediate ValueType;
 | 
|    static const CommandId kCmdId = kUniformMatrix2fvImmediate;
 | 
| @@ -10669,6 +10965,87 @@ static_assert(offsetof(GetUniformBlocksCHROMIUM, program) == 4,
 | 
|  static_assert(offsetof(GetUniformBlocksCHROMIUM, bucket_id) == 8,
 | 
|                "offset of GetUniformBlocksCHROMIUM bucket_id should be 8");
 | 
|  
 | 
| +struct GetTransformFeedbackVaryingsCHROMIUM {
 | 
| +  typedef GetTransformFeedbackVaryingsCHROMIUM ValueType;
 | 
| +  static const CommandId kCmdId = kGetTransformFeedbackVaryingsCHROMIUM;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  typedef uint32_t Result;
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program, uint32_t _bucket_id) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    bucket_id = _bucket_id;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd, GLuint _program, uint32_t _bucket_id) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _bucket_id);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t bucket_id;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetTransformFeedbackVaryingsCHROMIUM) == 12,
 | 
| +              "size of GetTransformFeedbackVaryingsCHROMIUM should be 12");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVaryingsCHROMIUM, header) == 0,
 | 
| +    "offset of GetTransformFeedbackVaryingsCHROMIUM header should be 0");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVaryingsCHROMIUM, program) == 4,
 | 
| +    "offset of GetTransformFeedbackVaryingsCHROMIUM program should be 4");
 | 
| +static_assert(
 | 
| +    offsetof(GetTransformFeedbackVaryingsCHROMIUM, bucket_id) == 8,
 | 
| +    "offset of GetTransformFeedbackVaryingsCHROMIUM bucket_id should be 8");
 | 
| +
 | 
| +struct GetUniformsES3CHROMIUM {
 | 
| +  typedef GetUniformsES3CHROMIUM ValueType;
 | 
| +  static const CommandId kCmdId = kGetUniformsES3CHROMIUM;
 | 
| +  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
 | 
| +  static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
 | 
| +
 | 
| +  typedef uint32_t Result;
 | 
| +
 | 
| +  static uint32_t ComputeSize() {
 | 
| +    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
 | 
| +  }
 | 
| +
 | 
| +  void SetHeader() { header.SetCmd<ValueType>(); }
 | 
| +
 | 
| +  void Init(GLuint _program, uint32_t _bucket_id) {
 | 
| +    SetHeader();
 | 
| +    program = _program;
 | 
| +    bucket_id = _bucket_id;
 | 
| +  }
 | 
| +
 | 
| +  void* Set(void* cmd, GLuint _program, uint32_t _bucket_id) {
 | 
| +    static_cast<ValueType*>(cmd)->Init(_program, _bucket_id);
 | 
| +    return NextCmdAddress<ValueType>(cmd);
 | 
| +  }
 | 
| +
 | 
| +  gpu::CommandHeader header;
 | 
| +  uint32_t program;
 | 
| +  uint32_t bucket_id;
 | 
| +};
 | 
| +
 | 
| +static_assert(sizeof(GetUniformsES3CHROMIUM) == 12,
 | 
| +              "size of GetUniformsES3CHROMIUM should be 12");
 | 
| +static_assert(offsetof(GetUniformsES3CHROMIUM, header) == 0,
 | 
| +              "offset of GetUniformsES3CHROMIUM header should be 0");
 | 
| +static_assert(offsetof(GetUniformsES3CHROMIUM, program) == 4,
 | 
| +              "offset of GetUniformsES3CHROMIUM program should be 4");
 | 
| +static_assert(offsetof(GetUniformsES3CHROMIUM, bucket_id) == 8,
 | 
| +              "offset of GetUniformsES3CHROMIUM bucket_id should be 8");
 | 
| +
 | 
|  struct GetTranslatedShaderSourceANGLE {
 | 
|    typedef GetTranslatedShaderSourceANGLE ValueType;
 | 
|    static const CommandId kCmdId = kGetTranslatedShaderSourceANGLE;
 | 
| 
 |