| Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
|
| diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
|
| index 1eb91850bab8053bcec34fbb353de331020a61c9..e05fc00f38db2f3dda51fd7bbbb8eb5eaa5a9485 100644
|
| --- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
|
| +++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
|
| @@ -287,8 +287,10 @@ virtual void Uniform2fv(GLint location,
|
| const GLfloat* v) OVERRIDE;
|
| virtual void Uniform2i(GLint location, GLint x, GLint y) OVERRIDE;
|
| virtual void Uniform2iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| -virtual void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
|
| - OVERRIDE;
|
| +virtual void Uniform3f(GLint location,
|
| + GLfloat x,
|
| + GLfloat y,
|
| + GLfloat z) OVERRIDE;
|
| virtual void Uniform3fv(GLint location,
|
| GLsizei count,
|
| const GLfloat* v) OVERRIDE;
|
| @@ -302,8 +304,11 @@ virtual void Uniform4f(GLint location,
|
| virtual void Uniform4fv(GLint location,
|
| GLsizei count,
|
| const GLfloat* v) OVERRIDE;
|
| -virtual void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
|
| - OVERRIDE;
|
| +virtual void Uniform4i(GLint location,
|
| + GLint x,
|
| + GLint y,
|
| + GLint z,
|
| + GLint w) OVERRIDE;
|
| virtual void Uniform4iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| virtual void UniformMatrix2fv(GLint location,
|
| GLsizei count,
|
| @@ -323,8 +328,10 @@ virtual void VertexAttrib1f(GLuint indx, GLfloat x) OVERRIDE;
|
| virtual void VertexAttrib1fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| virtual void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) OVERRIDE;
|
| virtual void VertexAttrib2fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| -virtual void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
|
| - OVERRIDE;
|
| +virtual void VertexAttrib3f(GLuint indx,
|
| + GLfloat x,
|
| + GLfloat y,
|
| + GLfloat z) OVERRIDE;
|
| virtual void VertexAttrib3fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| virtual void VertexAttrib4f(GLuint indx,
|
| GLfloat x,
|
| @@ -405,7 +412,7 @@ virtual void RegisterSharedIdsCHROMIUM(GLuint namespace_id,
|
| virtual GLboolean EnableFeatureCHROMIUM(const char* feature) OVERRIDE;
|
| virtual void* MapBufferCHROMIUM(GLuint target, GLenum access) OVERRIDE;
|
| virtual GLboolean UnmapBufferCHROMIUM(GLuint target) OVERRIDE;
|
| -virtual void* MapImageCHROMIUM(GLuint image_id, GLenum access) OVERRIDE;
|
| +virtual void* MapImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| virtual void UnmapImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| virtual void* MapBufferSubDataCHROMIUM(GLuint target,
|
| GLintptr offset,
|
| @@ -439,7 +446,8 @@ virtual void GetProgramInfoCHROMIUM(GLuint program,
|
| virtual GLuint CreateStreamTextureCHROMIUM(GLuint texture) OVERRIDE;
|
| virtual GLuint CreateImageCHROMIUM(GLsizei width,
|
| GLsizei height,
|
| - GLenum internalformat) OVERRIDE;
|
| + GLenum internalformat,
|
| + GLenum usage) OVERRIDE;
|
| virtual void DestroyImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| virtual void GetImageParameterivCHROMIUM(GLuint image_id,
|
| GLenum pname,
|
| @@ -448,8 +456,10 @@ virtual void GetTranslatedShaderSourceANGLE(GLuint shader,
|
| GLsizei bufsize,
|
| GLsizei* length,
|
| char* source) OVERRIDE;
|
| -virtual void PostSubBufferCHROMIUM(GLint x, GLint y, GLint width, GLint height)
|
| - OVERRIDE;
|
| +virtual void PostSubBufferCHROMIUM(GLint x,
|
| + GLint y,
|
| + GLint width,
|
| + GLint height) OVERRIDE;
|
| virtual void TexImageIOSurface2DCHROMIUM(GLenum target,
|
| GLsizei width,
|
| GLsizei height,
|
|
|