Merged in recent changes to command buffer code.

gpu/command_buffer/client/gles2_c_lib_autogen.h

 // This file is auto-generated. DO NOT EDIT!
 
 
 // These functions emluate GLES2 over command buffers.
 
 
 void GLES2ActiveTexture(GLenum texture) {
   gles2::GetGLContext()->ActiveTexture(texture);
 }
 void GLES2AttachShader(GLuint program, GLuint shader) {
@@ skipping 196 matching lines @@
 void GLES2GetActiveUniform(
     GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size,
     GLenum* type, char* name) {
   gles2::GetGLContext(
       )->GetActiveUniform(program, index, bufsize, length, size, type, name);
 }
 void GLES2GetAttachedShaders(
     GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) {
   gles2::GetGLContext()->GetAttachedShaders(program, maxcount, count, shaders);
 }
-int GLES2GetAttribLocation(GLuint program, const char* name) {
+GLint GLES2GetAttribLocation(GLuint program, const char* name) {
   return gles2::GetGLContext()->GetAttribLocation(program, name);
 }
 void GLES2GetBooleanv(GLenum pname, GLboolean* params) {
   gles2::GetGLContext()->GetBooleanv(pname, params);
 }
 void GLES2GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
   gles2::GetGLContext()->GetBufferParameteriv(target, pname, params);
 }
 GLenum GLES2GetError() {
   return gles2::GetGLContext()->GetError();
@@ skipping 45 matching lines @@
 }
 void GLES2GetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
   gles2::GetGLContext()->GetTexParameteriv(target, pname, params);
 }
 void GLES2GetUniformfv(GLuint program, GLint location, GLfloat* params) {
   gles2::GetGLContext()->GetUniformfv(program, location, params);
 }
 void GLES2GetUniformiv(GLuint program, GLint location, GLint* params) {
   gles2::GetGLContext()->GetUniformiv(program, location, params);
 }
-int GLES2GetUniformLocation(GLuint program, const char* name) {
+GLint GLES2GetUniformLocation(GLuint program, const char* name) {
   return gles2::GetGLContext()->GetUniformLocation(program, name);
 }
 void GLES2GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) {
   gles2::GetGLContext()->GetVertexAttribfv(index, pname, params);
 }
 void GLES2GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) {
   gles2::GetGLContext()->GetVertexAttribiv(index, pname, params);
 }
 void GLES2GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer) {
   gles2::GetGLContext()->GetVertexAttribPointerv(index, pname, pointer);
@@ skipping 201 matching lines @@
   gles2::GetGLContext(
       )->VertexAttribPointer(indx, size, type, normalized, stride, ptr);
 }
 void GLES2Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
   gles2::GetGLContext()->Viewport(x, y, width, height);
 }
 void GLES2SwapBuffers() {
   gles2::GetGLContext()->SwapBuffers();
 }