| Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
 | 
| diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
 | 
| index 766ce560e6645bac1b683dfafa960d6542342730..bd41c8f8f7af6ecef456d888aa9204ef17454d53 100644
 | 
| --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
 | 
| +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
 | 
| @@ -30,9 +30,15 @@ void GLES2BindFramebuffer(GLenum target, GLuint framebuffer) {
 | 
|  void GLES2BindRenderbuffer(GLenum target, GLuint renderbuffer) {
 | 
|    gles2::GetGLContext()->BindRenderbuffer(target, renderbuffer);
 | 
|  }
 | 
| +void GLES2BindSampler(GLuint unit, GLuint sampler) {
 | 
| +  gles2::GetGLContext()->BindSampler(unit, sampler);
 | 
| +}
 | 
|  void GLES2BindTexture(GLenum target, GLuint texture) {
 | 
|    gles2::GetGLContext()->BindTexture(target, texture);
 | 
|  }
 | 
| +void GLES2BindTransformFeedback(GLenum target, GLuint transformfeedback) {
 | 
| +  gles2::GetGLContext()->BindTransformFeedback(target, transformfeedback);
 | 
| +}
 | 
|  void GLES2BlendColor(GLclampf red,
 | 
|                       GLclampf green,
 | 
|                       GLclampf blue,
 | 
| @@ -167,12 +173,18 @@ void GLES2DeleteProgram(GLuint program) {
 | 
|  void GLES2DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) {
 | 
|    gles2::GetGLContext()->DeleteRenderbuffers(n, renderbuffers);
 | 
|  }
 | 
| +void GLES2DeleteSamplers(GLsizei n, const GLuint* samplers) {
 | 
| +  gles2::GetGLContext()->DeleteSamplers(n, samplers);
 | 
| +}
 | 
|  void GLES2DeleteShader(GLuint shader) {
 | 
|    gles2::GetGLContext()->DeleteShader(shader);
 | 
|  }
 | 
|  void GLES2DeleteTextures(GLsizei n, const GLuint* textures) {
 | 
|    gles2::GetGLContext()->DeleteTextures(n, textures);
 | 
|  }
 | 
| +void GLES2DeleteTransformFeedbacks(GLsizei n, const GLuint* ids) {
 | 
| +  gles2::GetGLContext()->DeleteTransformFeedbacks(n, ids);
 | 
| +}
 | 
|  void GLES2DepthFunc(GLenum func) {
 | 
|    gles2::GetGLContext()->DepthFunc(func);
 | 
|  }
 | 
| @@ -250,9 +262,15 @@ void GLES2GenFramebuffers(GLsizei n, GLuint* framebuffers) {
 | 
|  void GLES2GenRenderbuffers(GLsizei n, GLuint* renderbuffers) {
 | 
|    gles2::GetGLContext()->GenRenderbuffers(n, renderbuffers);
 | 
|  }
 | 
| +void GLES2GenSamplers(GLsizei n, GLuint* samplers) {
 | 
| +  gles2::GetGLContext()->GenSamplers(n, samplers);
 | 
| +}
 | 
|  void GLES2GenTextures(GLsizei n, GLuint* textures) {
 | 
|    gles2::GetGLContext()->GenTextures(n, textures);
 | 
|  }
 | 
| +void GLES2GenTransformFeedbacks(GLsizei n, GLuint* ids) {
 | 
| +  gles2::GetGLContext()->GenTransformFeedbacks(n, ids);
 | 
| +}
 | 
|  void GLES2GetActiveAttrib(GLuint program,
 | 
|                            GLuint index,
 | 
|                            GLsizei bufsize,
 | 
| @@ -326,6 +344,12 @@ void GLES2GetRenderbufferParameteriv(GLenum target,
 | 
|                                       GLint* params) {
 | 
|    gles2::GetGLContext()->GetRenderbufferParameteriv(target, pname, params);
 | 
|  }
 | 
| +void GLES2GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params) {
 | 
| +  gles2::GetGLContext()->GetSamplerParameterfv(sampler, pname, params);
 | 
| +}
 | 
| +void GLES2GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params) {
 | 
| +  gles2::GetGLContext()->GetSamplerParameteriv(sampler, pname, params);
 | 
| +}
 | 
|  void GLES2GetShaderiv(GLuint shader, GLenum pname, GLint* params) {
 | 
|    gles2::GetGLContext()->GetShaderiv(shader, pname, params);
 | 
|  }
 | 
| @@ -408,18 +432,27 @@ GLboolean GLES2IsProgram(GLuint program) {
 | 
|  GLboolean GLES2IsRenderbuffer(GLuint renderbuffer) {
 | 
|    return gles2::GetGLContext()->IsRenderbuffer(renderbuffer);
 | 
|  }
 | 
| +GLboolean GLES2IsSampler(GLuint sampler) {
 | 
| +  return gles2::GetGLContext()->IsSampler(sampler);
 | 
| +}
 | 
|  GLboolean GLES2IsShader(GLuint shader) {
 | 
|    return gles2::GetGLContext()->IsShader(shader);
 | 
|  }
 | 
|  GLboolean GLES2IsTexture(GLuint texture) {
 | 
|    return gles2::GetGLContext()->IsTexture(texture);
 | 
|  }
 | 
| +GLboolean GLES2IsTransformFeedback(GLuint transformfeedback) {
 | 
| +  return gles2::GetGLContext()->IsTransformFeedback(transformfeedback);
 | 
| +}
 | 
|  void GLES2LineWidth(GLfloat width) {
 | 
|    gles2::GetGLContext()->LineWidth(width);
 | 
|  }
 | 
|  void GLES2LinkProgram(GLuint program) {
 | 
|    gles2::GetGLContext()->LinkProgram(program);
 | 
|  }
 | 
| +void GLES2PauseTransformFeedback() {
 | 
| +  gles2::GetGLContext()->PauseTransformFeedback();
 | 
| +}
 | 
|  void GLES2PixelStorei(GLenum pname, GLint param) {
 | 
|    gles2::GetGLContext()->PixelStorei(pname, param);
 | 
|  }
 | 
| @@ -448,9 +481,28 @@ void GLES2RenderbufferStorage(GLenum target,
 | 
|    gles2::GetGLContext()->RenderbufferStorage(target, internalformat, width,
 | 
|                                               height);
 | 
|  }
 | 
| +void GLES2ResumeTransformFeedback() {
 | 
| +  gles2::GetGLContext()->ResumeTransformFeedback();
 | 
| +}
 | 
|  void GLES2SampleCoverage(GLclampf value, GLboolean invert) {
 | 
|    gles2::GetGLContext()->SampleCoverage(value, invert);
 | 
|  }
 | 
| +void GLES2SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) {
 | 
| +  gles2::GetGLContext()->SamplerParameterf(sampler, pname, param);
 | 
| +}
 | 
| +void GLES2SamplerParameterfv(GLuint sampler,
 | 
| +                             GLenum pname,
 | 
| +                             const GLfloat* params) {
 | 
| +  gles2::GetGLContext()->SamplerParameterfv(sampler, pname, params);
 | 
| +}
 | 
| +void GLES2SamplerParameteri(GLuint sampler, GLenum pname, GLint param) {
 | 
| +  gles2::GetGLContext()->SamplerParameteri(sampler, pname, param);
 | 
| +}
 | 
| +void GLES2SamplerParameteriv(GLuint sampler,
 | 
| +                             GLenum pname,
 | 
| +                             const GLint* params) {
 | 
| +  gles2::GetGLContext()->SamplerParameteriv(sampler, pname, params);
 | 
| +}
 | 
|  void GLES2Scissor(GLint x, GLint y, GLsizei width, GLsizei height) {
 | 
|    gles2::GetGLContext()->Scissor(x, y, width, height);
 | 
|  }
 | 
| @@ -799,9 +851,15 @@ GLboolean GLES2IsQueryEXT(GLuint id) {
 | 
|  void GLES2BeginQueryEXT(GLenum target, GLuint id) {
 | 
|    gles2::GetGLContext()->BeginQueryEXT(target, id);
 | 
|  }
 | 
| +void GLES2BeginTransformFeedback(GLenum primitivemode) {
 | 
| +  gles2::GetGLContext()->BeginTransformFeedback(primitivemode);
 | 
| +}
 | 
|  void GLES2EndQueryEXT(GLenum target) {
 | 
|    gles2::GetGLContext()->EndQueryEXT(target);
 | 
|  }
 | 
| +void GLES2EndTransformFeedback() {
 | 
| +  gles2::GetGLContext()->EndTransformFeedback();
 | 
| +}
 | 
|  void GLES2GetQueryivEXT(GLenum target, GLenum pname, GLint* params) {
 | 
|    gles2::GetGLContext()->GetQueryivEXT(target, pname, params);
 | 
|  }
 | 
| @@ -1124,10 +1182,18 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glBindRenderbuffer),
 | 
|      },
 | 
|      {
 | 
| +     "glBindSampler",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glBindSampler),
 | 
| +    },
 | 
| +    {
 | 
|       "glBindTexture",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glBindTexture),
 | 
|      },
 | 
|      {
 | 
| +     "glBindTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glBindTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glBlendColor",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glBlendColor),
 | 
|      },
 | 
| @@ -1232,6 +1298,10 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glDeleteRenderbuffers),
 | 
|      },
 | 
|      {
 | 
| +     "glDeleteSamplers",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glDeleteSamplers),
 | 
| +    },
 | 
| +    {
 | 
|       "glDeleteShader",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glDeleteShader),
 | 
|      },
 | 
| @@ -1240,6 +1310,10 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glDeleteTextures),
 | 
|      },
 | 
|      {
 | 
| +     "glDeleteTransformFeedbacks",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glDeleteTransformFeedbacks),
 | 
| +    },
 | 
| +    {
 | 
|       "glDepthFunc",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glDepthFunc),
 | 
|      },
 | 
| @@ -1320,10 +1394,18 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGenRenderbuffers),
 | 
|      },
 | 
|      {
 | 
| +     "glGenSamplers",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glGenSamplers),
 | 
| +    },
 | 
| +    {
 | 
|       "glGenTextures",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGenTextures),
 | 
|      },
 | 
|      {
 | 
| +     "glGenTransformFeedbacks",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glGenTransformFeedbacks),
 | 
| +    },
 | 
| +    {
 | 
|       "glGetActiveAttrib",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGetActiveAttrib),
 | 
|      },
 | 
| @@ -1381,6 +1463,14 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGetRenderbufferParameteriv),
 | 
|      },
 | 
|      {
 | 
| +     "glGetSamplerParameterfv",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glGetSamplerParameterfv),
 | 
| +    },
 | 
| +    {
 | 
| +     "glGetSamplerParameteriv",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glGetSamplerParameteriv),
 | 
| +    },
 | 
| +    {
 | 
|       "glGetShaderiv",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGetShaderiv),
 | 
|      },
 | 
| @@ -1465,6 +1555,10 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glIsRenderbuffer),
 | 
|      },
 | 
|      {
 | 
| +     "glIsSampler",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glIsSampler),
 | 
| +    },
 | 
| +    {
 | 
|       "glIsShader",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glIsShader),
 | 
|      },
 | 
| @@ -1473,6 +1567,10 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glIsTexture),
 | 
|      },
 | 
|      {
 | 
| +     "glIsTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glIsTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glLineWidth",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glLineWidth),
 | 
|      },
 | 
| @@ -1481,6 +1579,10 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glLinkProgram),
 | 
|      },
 | 
|      {
 | 
| +     "glPauseTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glPauseTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glPixelStorei",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glPixelStorei),
 | 
|      },
 | 
| @@ -1505,10 +1607,30 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glRenderbufferStorage),
 | 
|      },
 | 
|      {
 | 
| +     "glResumeTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glResumeTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glSampleCoverage",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glSampleCoverage),
 | 
|      },
 | 
|      {
 | 
| +     "glSamplerParameterf",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glSamplerParameterf),
 | 
| +    },
 | 
| +    {
 | 
| +     "glSamplerParameterfv",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glSamplerParameterfv),
 | 
| +    },
 | 
| +    {
 | 
| +     "glSamplerParameteri",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glSamplerParameteri),
 | 
| +    },
 | 
| +    {
 | 
| +     "glSamplerParameteriv",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glSamplerParameteriv),
 | 
| +    },
 | 
| +    {
 | 
|       "glScissor",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glScissor),
 | 
|      },
 | 
| @@ -1820,10 +1942,18 @@ extern const NameToFunc g_gles2_function_table[] = {
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glBeginQueryEXT),
 | 
|      },
 | 
|      {
 | 
| +     "glBeginTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glBeginTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glEndQueryEXT",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glEndQueryEXT),
 | 
|      },
 | 
|      {
 | 
| +     "glEndTransformFeedback",
 | 
| +     reinterpret_cast<GLES2FunctionPointer>(glEndTransformFeedback),
 | 
| +    },
 | 
| +    {
 | 
|       "glGetQueryivEXT",
 | 
|       reinterpret_cast<GLES2FunctionPointer>(glGetQueryivEXT),
 | 
|      },
 | 
| 
 |