| Index: gpu/command_buffer/client/gles2_implementation_autogen.h
|
| diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
|
| index 0a53a8635c6a1f1b2705eaf41acdb3b502259803..1a3694334204a938ae6f0669217c80496a883c09 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation_autogen.h
|
| +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
|
| @@ -13,67 +13,67 @@
|
| #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
|
| #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
|
|
|
| -virtual void ActiveTexture(GLenum texture) OVERRIDE;
|
| +virtual void ActiveTexture(GLenum texture) override;
|
|
|
| -virtual void AttachShader(GLuint program, GLuint shader) OVERRIDE;
|
| +virtual void AttachShader(GLuint program, GLuint shader) override;
|
|
|
| virtual void BindAttribLocation(GLuint program,
|
| GLuint index,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| -virtual void BindBuffer(GLenum target, GLuint buffer) OVERRIDE;
|
| +virtual void BindBuffer(GLenum target, GLuint buffer) override;
|
|
|
| -virtual void BindFramebuffer(GLenum target, GLuint framebuffer) OVERRIDE;
|
| +virtual void BindFramebuffer(GLenum target, GLuint framebuffer) override;
|
|
|
| -virtual void BindRenderbuffer(GLenum target, GLuint renderbuffer) OVERRIDE;
|
| +virtual void BindRenderbuffer(GLenum target, GLuint renderbuffer) override;
|
|
|
| -virtual void BindTexture(GLenum target, GLuint texture) OVERRIDE;
|
| +virtual void BindTexture(GLenum target, GLuint texture) override;
|
|
|
| virtual void BlendColor(GLclampf red,
|
| GLclampf green,
|
| GLclampf blue,
|
| - GLclampf alpha) OVERRIDE;
|
| + GLclampf alpha) override;
|
|
|
| -virtual void BlendEquation(GLenum mode) OVERRIDE;
|
| +virtual void BlendEquation(GLenum mode) override;
|
|
|
| -virtual void BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) OVERRIDE;
|
| +virtual void BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) override;
|
|
|
| -virtual void BlendFunc(GLenum sfactor, GLenum dfactor) OVERRIDE;
|
| +virtual void BlendFunc(GLenum sfactor, GLenum dfactor) override;
|
|
|
| virtual void BlendFuncSeparate(GLenum srcRGB,
|
| GLenum dstRGB,
|
| GLenum srcAlpha,
|
| - GLenum dstAlpha) OVERRIDE;
|
| + GLenum dstAlpha) override;
|
|
|
| virtual void BufferData(GLenum target,
|
| GLsizeiptr size,
|
| const void* data,
|
| - GLenum usage) OVERRIDE;
|
| + GLenum usage) override;
|
|
|
| virtual void BufferSubData(GLenum target,
|
| GLintptr offset,
|
| GLsizeiptr size,
|
| - const void* data) OVERRIDE;
|
| + const void* data) override;
|
|
|
| -virtual GLenum CheckFramebufferStatus(GLenum target) OVERRIDE;
|
| +virtual GLenum CheckFramebufferStatus(GLenum target) override;
|
|
|
| -virtual void Clear(GLbitfield mask) OVERRIDE;
|
| +virtual void Clear(GLbitfield mask) override;
|
|
|
| virtual void ClearColor(GLclampf red,
|
| GLclampf green,
|
| GLclampf blue,
|
| - GLclampf alpha) OVERRIDE;
|
| + GLclampf alpha) override;
|
|
|
| -virtual void ClearDepthf(GLclampf depth) OVERRIDE;
|
| +virtual void ClearDepthf(GLclampf depth) override;
|
|
|
| -virtual void ClearStencil(GLint s) OVERRIDE;
|
| +virtual void ClearStencil(GLint s) override;
|
|
|
| virtual void ColorMask(GLboolean red,
|
| GLboolean green,
|
| GLboolean blue,
|
| - GLboolean alpha) OVERRIDE;
|
| + GLboolean alpha) override;
|
|
|
| -virtual void CompileShader(GLuint shader) OVERRIDE;
|
| +virtual void CompileShader(GLuint shader) override;
|
|
|
| virtual void CompressedTexImage2D(GLenum target,
|
| GLint level,
|
| @@ -82,7 +82,7 @@ virtual void CompressedTexImage2D(GLenum target,
|
| GLsizei height,
|
| GLint border,
|
| GLsizei imageSize,
|
| - const void* data) OVERRIDE;
|
| + const void* data) override;
|
|
|
| virtual void CompressedTexSubImage2D(GLenum target,
|
| GLint level,
|
| @@ -92,7 +92,7 @@ virtual void CompressedTexSubImage2D(GLenum target,
|
| GLsizei height,
|
| GLenum format,
|
| GLsizei imageSize,
|
| - const void* data) OVERRIDE;
|
| + const void* data) override;
|
|
|
| virtual void CopyTexImage2D(GLenum target,
|
| GLint level,
|
| @@ -101,7 +101,7 @@ virtual void CopyTexImage2D(GLenum target,
|
| GLint y,
|
| GLsizei width,
|
| GLsizei height,
|
| - GLint border) OVERRIDE;
|
| + GLint border) override;
|
|
|
| virtual void CopyTexSubImage2D(GLenum target,
|
| GLint level,
|
| @@ -110,72 +110,72 @@ virtual void CopyTexSubImage2D(GLenum target,
|
| GLint x,
|
| GLint y,
|
| GLsizei width,
|
| - GLsizei height) OVERRIDE;
|
| + GLsizei height) override;
|
|
|
| -virtual GLuint CreateProgram() OVERRIDE;
|
| +virtual GLuint CreateProgram() override;
|
|
|
| -virtual GLuint CreateShader(GLenum type) OVERRIDE;
|
| +virtual GLuint CreateShader(GLenum type) override;
|
|
|
| -virtual void CullFace(GLenum mode) OVERRIDE;
|
| +virtual void CullFace(GLenum mode) override;
|
|
|
| -virtual void DeleteBuffers(GLsizei n, const GLuint* buffers) OVERRIDE;
|
| +virtual void DeleteBuffers(GLsizei n, const GLuint* buffers) override;
|
|
|
| -virtual void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) OVERRIDE;
|
| +virtual void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) override;
|
|
|
| -virtual void DeleteProgram(GLuint program) OVERRIDE;
|
| +virtual void DeleteProgram(GLuint program) override;
|
|
|
| virtual void DeleteRenderbuffers(GLsizei n,
|
| - const GLuint* renderbuffers) OVERRIDE;
|
| + const GLuint* renderbuffers) override;
|
|
|
| -virtual void DeleteShader(GLuint shader) OVERRIDE;
|
| +virtual void DeleteShader(GLuint shader) override;
|
|
|
| -virtual void DeleteTextures(GLsizei n, const GLuint* textures) OVERRIDE;
|
| +virtual void DeleteTextures(GLsizei n, const GLuint* textures) override;
|
|
|
| -virtual void DepthFunc(GLenum func) OVERRIDE;
|
| +virtual void DepthFunc(GLenum func) override;
|
|
|
| -virtual void DepthMask(GLboolean flag) OVERRIDE;
|
| +virtual void DepthMask(GLboolean flag) override;
|
|
|
| -virtual void DepthRangef(GLclampf zNear, GLclampf zFar) OVERRIDE;
|
| +virtual void DepthRangef(GLclampf zNear, GLclampf zFar) override;
|
|
|
| -virtual void DetachShader(GLuint program, GLuint shader) OVERRIDE;
|
| +virtual void DetachShader(GLuint program, GLuint shader) override;
|
|
|
| -virtual void Disable(GLenum cap) OVERRIDE;
|
| +virtual void Disable(GLenum cap) override;
|
|
|
| -virtual void DrawArrays(GLenum mode, GLint first, GLsizei count) OVERRIDE;
|
| +virtual void DrawArrays(GLenum mode, GLint first, GLsizei count) override;
|
|
|
| virtual void DrawElements(GLenum mode,
|
| GLsizei count,
|
| GLenum type,
|
| - const void* indices) OVERRIDE;
|
| + const void* indices) override;
|
|
|
| -virtual void Enable(GLenum cap) OVERRIDE;
|
| +virtual void Enable(GLenum cap) override;
|
|
|
| -virtual void Finish() OVERRIDE;
|
| +virtual void Finish() override;
|
|
|
| -virtual void Flush() OVERRIDE;
|
| +virtual void Flush() override;
|
|
|
| virtual void FramebufferRenderbuffer(GLenum target,
|
| GLenum attachment,
|
| GLenum renderbuffertarget,
|
| - GLuint renderbuffer) OVERRIDE;
|
| + GLuint renderbuffer) override;
|
|
|
| virtual void FramebufferTexture2D(GLenum target,
|
| GLenum attachment,
|
| GLenum textarget,
|
| GLuint texture,
|
| - GLint level) OVERRIDE;
|
| + GLint level) override;
|
|
|
| -virtual void FrontFace(GLenum mode) OVERRIDE;
|
| +virtual void FrontFace(GLenum mode) override;
|
|
|
| -virtual void GenBuffers(GLsizei n, GLuint* buffers) OVERRIDE;
|
| +virtual void GenBuffers(GLsizei n, GLuint* buffers) override;
|
|
|
| -virtual void GenerateMipmap(GLenum target) OVERRIDE;
|
| +virtual void GenerateMipmap(GLenum target) override;
|
|
|
| -virtual void GenFramebuffers(GLsizei n, GLuint* framebuffers) OVERRIDE;
|
| +virtual void GenFramebuffers(GLsizei n, GLuint* framebuffers) override;
|
|
|
| -virtual void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) OVERRIDE;
|
| +virtual void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override;
|
|
|
| -virtual void GenTextures(GLsizei n, GLuint* textures) OVERRIDE;
|
| +virtual void GenTextures(GLsizei n, GLuint* textures) override;
|
|
|
| virtual void GetActiveAttrib(GLuint program,
|
| GLuint index,
|
| @@ -183,7 +183,7 @@ virtual void GetActiveAttrib(GLuint program,
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| virtual void GetActiveUniform(GLuint program,
|
| GLuint index,
|
| @@ -191,107 +191,107 @@ virtual void GetActiveUniform(GLuint program,
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| virtual void GetAttachedShaders(GLuint program,
|
| GLsizei maxcount,
|
| GLsizei* count,
|
| - GLuint* shaders) OVERRIDE;
|
| + GLuint* shaders) override;
|
|
|
| -virtual GLint GetAttribLocation(GLuint program, const char* name) OVERRIDE;
|
| +virtual GLint GetAttribLocation(GLuint program, const char* name) override;
|
|
|
| -virtual void GetBooleanv(GLenum pname, GLboolean* params) OVERRIDE;
|
| +virtual void GetBooleanv(GLenum pname, GLboolean* params) override;
|
|
|
| virtual void GetBufferParameteriv(GLenum target,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| -virtual GLenum GetError() OVERRIDE;
|
| +virtual GLenum GetError() override;
|
|
|
| -virtual void GetFloatv(GLenum pname, GLfloat* params) OVERRIDE;
|
| +virtual void GetFloatv(GLenum pname, GLfloat* params) override;
|
|
|
| virtual void GetFramebufferAttachmentParameteriv(GLenum target,
|
| GLenum attachment,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| -virtual void GetIntegerv(GLenum pname, GLint* params) OVERRIDE;
|
| +virtual void GetIntegerv(GLenum pname, GLint* params) override;
|
|
|
| -virtual void GetProgramiv(GLuint program, GLenum pname, GLint* params) OVERRIDE;
|
| +virtual void GetProgramiv(GLuint program, GLenum pname, GLint* params) override;
|
|
|
| virtual void GetProgramInfoLog(GLuint program,
|
| GLsizei bufsize,
|
| GLsizei* length,
|
| - char* infolog) OVERRIDE;
|
| + char* infolog) override;
|
|
|
| virtual void GetRenderbufferParameteriv(GLenum target,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| -virtual void GetShaderiv(GLuint shader, GLenum pname, GLint* params) OVERRIDE;
|
| +virtual void GetShaderiv(GLuint shader, GLenum pname, GLint* params) override;
|
|
|
| virtual void GetShaderInfoLog(GLuint shader,
|
| GLsizei bufsize,
|
| GLsizei* length,
|
| - char* infolog) OVERRIDE;
|
| + char* infolog) override;
|
|
|
| virtual void GetShaderPrecisionFormat(GLenum shadertype,
|
| GLenum precisiontype,
|
| GLint* range,
|
| - GLint* precision) OVERRIDE;
|
| + GLint* precision) override;
|
|
|
| virtual void GetShaderSource(GLuint shader,
|
| GLsizei bufsize,
|
| GLsizei* length,
|
| - char* source) OVERRIDE;
|
| + char* source) override;
|
|
|
| -virtual const GLubyte* GetString(GLenum name) OVERRIDE;
|
| +virtual const GLubyte* GetString(GLenum name) override;
|
|
|
| virtual void GetTexParameterfv(GLenum target,
|
| GLenum pname,
|
| - GLfloat* params) OVERRIDE;
|
| + GLfloat* params) override;
|
|
|
| virtual void GetTexParameteriv(GLenum target,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| virtual void GetUniformfv(GLuint program,
|
| GLint location,
|
| - GLfloat* params) OVERRIDE;
|
| + GLfloat* params) override;
|
|
|
| virtual void GetUniformiv(GLuint program,
|
| GLint location,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| -virtual GLint GetUniformLocation(GLuint program, const char* name) OVERRIDE;
|
| +virtual GLint GetUniformLocation(GLuint program, const char* name) override;
|
|
|
| virtual void GetVertexAttribPointerv(GLuint index,
|
| GLenum pname,
|
| - void** pointer) OVERRIDE;
|
| + void** pointer) override;
|
|
|
| -virtual void Hint(GLenum target, GLenum mode) OVERRIDE;
|
| +virtual void Hint(GLenum target, GLenum mode) override;
|
|
|
| -virtual GLboolean IsBuffer(GLuint buffer) OVERRIDE;
|
| +virtual GLboolean IsBuffer(GLuint buffer) override;
|
|
|
| -virtual GLboolean IsEnabled(GLenum cap) OVERRIDE;
|
| +virtual GLboolean IsEnabled(GLenum cap) override;
|
|
|
| -virtual GLboolean IsFramebuffer(GLuint framebuffer) OVERRIDE;
|
| +virtual GLboolean IsFramebuffer(GLuint framebuffer) override;
|
|
|
| -virtual GLboolean IsProgram(GLuint program) OVERRIDE;
|
| +virtual GLboolean IsProgram(GLuint program) override;
|
|
|
| -virtual GLboolean IsRenderbuffer(GLuint renderbuffer) OVERRIDE;
|
| +virtual GLboolean IsRenderbuffer(GLuint renderbuffer) override;
|
|
|
| -virtual GLboolean IsShader(GLuint shader) OVERRIDE;
|
| +virtual GLboolean IsShader(GLuint shader) override;
|
|
|
| -virtual GLboolean IsTexture(GLuint texture) OVERRIDE;
|
| +virtual GLboolean IsTexture(GLuint texture) override;
|
|
|
| -virtual void LineWidth(GLfloat width) OVERRIDE;
|
| +virtual void LineWidth(GLfloat width) override;
|
|
|
| -virtual void LinkProgram(GLuint program) OVERRIDE;
|
| +virtual void LinkProgram(GLuint program) override;
|
|
|
| -virtual void PixelStorei(GLenum pname, GLint param) OVERRIDE;
|
| +virtual void PixelStorei(GLenum pname, GLint param) override;
|
|
|
| -virtual void PolygonOffset(GLfloat factor, GLfloat units) OVERRIDE;
|
| +virtual void PolygonOffset(GLfloat factor, GLfloat units) override;
|
|
|
| virtual void ReadPixels(GLint x,
|
| GLint y,
|
| @@ -299,51 +299,51 @@ virtual void ReadPixels(GLint x,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - void* pixels) OVERRIDE;
|
| + void* pixels) override;
|
|
|
| -virtual void ReleaseShaderCompiler() OVERRIDE;
|
| +virtual void ReleaseShaderCompiler() override;
|
|
|
| virtual void RenderbufferStorage(GLenum target,
|
| GLenum internalformat,
|
| GLsizei width,
|
| - GLsizei height) OVERRIDE;
|
| + GLsizei height) override;
|
|
|
| -virtual void SampleCoverage(GLclampf value, GLboolean invert) OVERRIDE;
|
| +virtual void SampleCoverage(GLclampf value, GLboolean invert) override;
|
|
|
| -virtual void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) OVERRIDE;
|
| +virtual void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) override;
|
|
|
| virtual void ShaderBinary(GLsizei n,
|
| const GLuint* shaders,
|
| GLenum binaryformat,
|
| const void* binary,
|
| - GLsizei length) OVERRIDE;
|
| + GLsizei length) override;
|
|
|
| virtual void ShaderSource(GLuint shader,
|
| GLsizei count,
|
| const GLchar* const* str,
|
| - const GLint* length) OVERRIDE;
|
| + const GLint* length) override;
|
|
|
| -virtual void ShallowFinishCHROMIUM() OVERRIDE;
|
| +virtual void ShallowFinishCHROMIUM() override;
|
|
|
| -virtual void ShallowFlushCHROMIUM() OVERRIDE;
|
| +virtual void ShallowFlushCHROMIUM() override;
|
|
|
| -virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
|
| +virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) override;
|
|
|
| virtual void StencilFuncSeparate(GLenum face,
|
| GLenum func,
|
| GLint ref,
|
| - GLuint mask) OVERRIDE;
|
| + GLuint mask) override;
|
|
|
| -virtual void StencilMask(GLuint mask) OVERRIDE;
|
| +virtual void StencilMask(GLuint mask) override;
|
|
|
| -virtual void StencilMaskSeparate(GLenum face, GLuint mask) OVERRIDE;
|
| +virtual void StencilMaskSeparate(GLenum face, GLuint mask) override;
|
|
|
| -virtual void StencilOp(GLenum fail, GLenum zfail, GLenum zpass) OVERRIDE;
|
| +virtual void StencilOp(GLenum fail, GLenum zfail, GLenum zpass) override;
|
|
|
| virtual void StencilOpSeparate(GLenum face,
|
| GLenum fail,
|
| GLenum zfail,
|
| - GLenum zpass) OVERRIDE;
|
| + GLenum zpass) override;
|
|
|
| virtual void TexImage2D(GLenum target,
|
| GLint level,
|
| @@ -353,19 +353,19 @@ virtual void TexImage2D(GLenum target,
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - const void* pixels) OVERRIDE;
|
| + const void* pixels) override;
|
|
|
| -virtual void TexParameterf(GLenum target, GLenum pname, GLfloat param) OVERRIDE;
|
| +virtual void TexParameterf(GLenum target, GLenum pname, GLfloat param) override;
|
|
|
| virtual void TexParameterfv(GLenum target,
|
| GLenum pname,
|
| - const GLfloat* params) OVERRIDE;
|
| + const GLfloat* params) override;
|
|
|
| -virtual void TexParameteri(GLenum target, GLenum pname, GLint param) OVERRIDE;
|
| +virtual void TexParameteri(GLenum target, GLenum pname, GLint param) override;
|
|
|
| virtual void TexParameteriv(GLenum target,
|
| GLenum pname,
|
| - const GLint* params) OVERRIDE;
|
| + const GLint* params) override;
|
|
|
| virtual void TexSubImage2D(GLenum target,
|
| GLint level,
|
| @@ -375,109 +375,109 @@ virtual void TexSubImage2D(GLenum target,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - const void* pixels) OVERRIDE;
|
| + const void* pixels) override;
|
|
|
| -virtual void Uniform1f(GLint location, GLfloat x) OVERRIDE;
|
| +virtual void Uniform1f(GLint location, GLfloat x) override;
|
|
|
| virtual void Uniform1fv(GLint location,
|
| GLsizei count,
|
| - const GLfloat* v) OVERRIDE;
|
| + const GLfloat* v) override;
|
|
|
| -virtual void Uniform1i(GLint location, GLint x) OVERRIDE;
|
| +virtual void Uniform1i(GLint location, GLint x) override;
|
|
|
| -virtual void Uniform1iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| +virtual void Uniform1iv(GLint location, GLsizei count, const GLint* v) override;
|
|
|
| -virtual void Uniform2f(GLint location, GLfloat x, GLfloat y) OVERRIDE;
|
| +virtual void Uniform2f(GLint location, GLfloat x, GLfloat y) override;
|
|
|
| virtual void Uniform2fv(GLint location,
|
| GLsizei count,
|
| - const GLfloat* v) OVERRIDE;
|
| + const GLfloat* v) override;
|
|
|
| -virtual void Uniform2i(GLint location, GLint x, GLint y) OVERRIDE;
|
| +virtual void Uniform2i(GLint location, GLint x, GLint y) override;
|
|
|
| -virtual void Uniform2iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| +virtual void Uniform2iv(GLint location, GLsizei count, const GLint* v) override;
|
|
|
| virtual void Uniform3f(GLint location,
|
| GLfloat x,
|
| GLfloat y,
|
| - GLfloat z) OVERRIDE;
|
| + GLfloat z) override;
|
|
|
| virtual void Uniform3fv(GLint location,
|
| GLsizei count,
|
| - const GLfloat* v) OVERRIDE;
|
| + const GLfloat* v) override;
|
|
|
| -virtual void Uniform3i(GLint location, GLint x, GLint y, GLint z) OVERRIDE;
|
| +virtual void Uniform3i(GLint location, GLint x, GLint y, GLint z) override;
|
|
|
| -virtual void Uniform3iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| +virtual void Uniform3iv(GLint location, GLsizei count, const GLint* v) override;
|
|
|
| virtual void Uniform4f(GLint location,
|
| GLfloat x,
|
| GLfloat y,
|
| GLfloat z,
|
| - GLfloat w) OVERRIDE;
|
| + GLfloat w) override;
|
|
|
| virtual void Uniform4fv(GLint location,
|
| GLsizei count,
|
| - const GLfloat* v) OVERRIDE;
|
| + const GLfloat* v) override;
|
|
|
| virtual void Uniform4i(GLint location,
|
| GLint x,
|
| GLint y,
|
| GLint z,
|
| - GLint w) OVERRIDE;
|
| + GLint w) override;
|
|
|
| -virtual void Uniform4iv(GLint location, GLsizei count, const GLint* v) OVERRIDE;
|
| +virtual void Uniform4iv(GLint location, GLsizei count, const GLint* v) override;
|
|
|
| virtual void UniformMatrix2fv(GLint location,
|
| GLsizei count,
|
| GLboolean transpose,
|
| - const GLfloat* value) OVERRIDE;
|
| + const GLfloat* value) override;
|
|
|
| virtual void UniformMatrix3fv(GLint location,
|
| GLsizei count,
|
| GLboolean transpose,
|
| - const GLfloat* value) OVERRIDE;
|
| + const GLfloat* value) override;
|
|
|
| virtual void UniformMatrix4fv(GLint location,
|
| GLsizei count,
|
| GLboolean transpose,
|
| - const GLfloat* value) OVERRIDE;
|
| + const GLfloat* value) override;
|
|
|
| -virtual void UseProgram(GLuint program) OVERRIDE;
|
| +virtual void UseProgram(GLuint program) override;
|
|
|
| -virtual void ValidateProgram(GLuint program) OVERRIDE;
|
| +virtual void ValidateProgram(GLuint program) override;
|
|
|
| -virtual void VertexAttrib1f(GLuint indx, GLfloat x) OVERRIDE;
|
| +virtual void VertexAttrib1f(GLuint indx, GLfloat x) override;
|
|
|
| -virtual void VertexAttrib1fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| +virtual void VertexAttrib1fv(GLuint indx, const GLfloat* values) override;
|
|
|
| -virtual void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) OVERRIDE;
|
| +virtual void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) override;
|
|
|
| -virtual void VertexAttrib2fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| +virtual void VertexAttrib2fv(GLuint indx, const GLfloat* values) override;
|
|
|
| virtual void VertexAttrib3f(GLuint indx,
|
| GLfloat x,
|
| GLfloat y,
|
| - GLfloat z) OVERRIDE;
|
| + GLfloat z) override;
|
|
|
| -virtual void VertexAttrib3fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| +virtual void VertexAttrib3fv(GLuint indx, const GLfloat* values) override;
|
|
|
| virtual void VertexAttrib4f(GLuint indx,
|
| GLfloat x,
|
| GLfloat y,
|
| GLfloat z,
|
| - GLfloat w) OVERRIDE;
|
| + GLfloat w) override;
|
|
|
| -virtual void VertexAttrib4fv(GLuint indx, const GLfloat* values) OVERRIDE;
|
| +virtual void VertexAttrib4fv(GLuint indx, const GLfloat* values) override;
|
|
|
| virtual void VertexAttribPointer(GLuint indx,
|
| GLint size,
|
| GLenum type,
|
| GLboolean normalized,
|
| GLsizei stride,
|
| - const void* ptr) OVERRIDE;
|
| + const void* ptr) override;
|
|
|
| -virtual void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) OVERRIDE;
|
| +virtual void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override;
|
|
|
| virtual void BlitFramebufferCHROMIUM(GLint srcX0,
|
| GLint srcY0,
|
| @@ -488,87 +488,87 @@ virtual void BlitFramebufferCHROMIUM(GLint srcX0,
|
| GLint dstX1,
|
| GLint dstY1,
|
| GLbitfield mask,
|
| - GLenum filter) OVERRIDE;
|
| + GLenum filter) override;
|
|
|
| virtual void RenderbufferStorageMultisampleCHROMIUM(GLenum target,
|
| GLsizei samples,
|
| GLenum internalformat,
|
| GLsizei width,
|
| - GLsizei height) OVERRIDE;
|
| + GLsizei height) override;
|
|
|
| virtual void RenderbufferStorageMultisampleEXT(GLenum target,
|
| GLsizei samples,
|
| GLenum internalformat,
|
| GLsizei width,
|
| - GLsizei height) OVERRIDE;
|
| + GLsizei height) override;
|
|
|
| virtual void FramebufferTexture2DMultisampleEXT(GLenum target,
|
| GLenum attachment,
|
| GLenum textarget,
|
| GLuint texture,
|
| GLint level,
|
| - GLsizei samples) OVERRIDE;
|
| + GLsizei samples) override;
|
|
|
| virtual void TexStorage2DEXT(GLenum target,
|
| GLsizei levels,
|
| GLenum internalFormat,
|
| GLsizei width,
|
| - GLsizei height) OVERRIDE;
|
| + GLsizei height) override;
|
|
|
| -virtual void GenQueriesEXT(GLsizei n, GLuint* queries) OVERRIDE;
|
| +virtual void GenQueriesEXT(GLsizei n, GLuint* queries) override;
|
|
|
| -virtual void DeleteQueriesEXT(GLsizei n, const GLuint* queries) OVERRIDE;
|
| +virtual void DeleteQueriesEXT(GLsizei n, const GLuint* queries) override;
|
|
|
| -virtual GLboolean IsQueryEXT(GLuint id) OVERRIDE;
|
| +virtual GLboolean IsQueryEXT(GLuint id) override;
|
|
|
| -virtual void BeginQueryEXT(GLenum target, GLuint id) OVERRIDE;
|
| +virtual void BeginQueryEXT(GLenum target, GLuint id) override;
|
|
|
| -virtual void EndQueryEXT(GLenum target) OVERRIDE;
|
| +virtual void EndQueryEXT(GLenum target) override;
|
|
|
| -virtual void GetQueryivEXT(GLenum target, GLenum pname, GLint* params) OVERRIDE;
|
| +virtual void GetQueryivEXT(GLenum target, GLenum pname, GLint* params) override;
|
|
|
| virtual void GetQueryObjectuivEXT(GLuint id,
|
| GLenum pname,
|
| - GLuint* params) OVERRIDE;
|
| + GLuint* params) override;
|
|
|
| virtual void InsertEventMarkerEXT(GLsizei length,
|
| - const GLchar* marker) OVERRIDE;
|
| + const GLchar* marker) override;
|
|
|
| -virtual void PushGroupMarkerEXT(GLsizei length, const GLchar* marker) OVERRIDE;
|
| +virtual void PushGroupMarkerEXT(GLsizei length, const GLchar* marker) override;
|
|
|
| -virtual void PopGroupMarkerEXT() OVERRIDE;
|
| +virtual void PopGroupMarkerEXT() override;
|
|
|
| -virtual void GenVertexArraysOES(GLsizei n, GLuint* arrays) OVERRIDE;
|
| +virtual void GenVertexArraysOES(GLsizei n, GLuint* arrays) override;
|
|
|
| -virtual void DeleteVertexArraysOES(GLsizei n, const GLuint* arrays) OVERRIDE;
|
| +virtual void DeleteVertexArraysOES(GLsizei n, const GLuint* arrays) override;
|
|
|
| -virtual GLboolean IsVertexArrayOES(GLuint array) OVERRIDE;
|
| +virtual GLboolean IsVertexArrayOES(GLuint array) override;
|
|
|
| -virtual void BindVertexArrayOES(GLuint array) OVERRIDE;
|
| +virtual void BindVertexArrayOES(GLuint array) override;
|
|
|
| -virtual void SwapBuffers() OVERRIDE;
|
| +virtual void SwapBuffers() override;
|
|
|
| virtual GLuint GetMaxValueInBufferCHROMIUM(GLuint buffer_id,
|
| GLsizei count,
|
| GLenum type,
|
| - GLuint offset) OVERRIDE;
|
| + GLuint offset) override;
|
|
|
| -virtual GLboolean EnableFeatureCHROMIUM(const char* feature) OVERRIDE;
|
| +virtual GLboolean EnableFeatureCHROMIUM(const char* feature) override;
|
|
|
| -virtual void* MapBufferCHROMIUM(GLuint target, GLenum access) OVERRIDE;
|
| +virtual void* MapBufferCHROMIUM(GLuint target, GLenum access) override;
|
|
|
| -virtual GLboolean UnmapBufferCHROMIUM(GLuint target) OVERRIDE;
|
| +virtual GLboolean UnmapBufferCHROMIUM(GLuint target) override;
|
|
|
| -virtual void* MapImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| +virtual void* MapImageCHROMIUM(GLuint image_id) override;
|
|
|
| -virtual void UnmapImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| +virtual void UnmapImageCHROMIUM(GLuint image_id) override;
|
|
|
| virtual void* MapBufferSubDataCHROMIUM(GLuint target,
|
| GLintptr offset,
|
| GLsizeiptr size,
|
| - GLenum access) OVERRIDE;
|
| + GLenum access) override;
|
|
|
| -virtual void UnmapBufferSubDataCHROMIUM(const void* mem) OVERRIDE;
|
| +virtual void UnmapBufferSubDataCHROMIUM(const void* mem) override;
|
|
|
| virtual void* MapTexSubImage2DCHROMIUM(GLenum target,
|
| GLint level,
|
| @@ -578,110 +578,110 @@ virtual void* MapTexSubImage2DCHROMIUM(GLenum target,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - GLenum access) OVERRIDE;
|
| + GLenum access) override;
|
|
|
| -virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) OVERRIDE;
|
| +virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) override;
|
|
|
| virtual void ResizeCHROMIUM(GLuint width,
|
| GLuint height,
|
| - GLfloat scale_factor) OVERRIDE;
|
| + GLfloat scale_factor) override;
|
|
|
| -virtual const GLchar* GetRequestableExtensionsCHROMIUM() OVERRIDE;
|
| +virtual const GLchar* GetRequestableExtensionsCHROMIUM() override;
|
|
|
| -virtual void RequestExtensionCHROMIUM(const char* extension) OVERRIDE;
|
| +virtual void RequestExtensionCHROMIUM(const char* extension) override;
|
|
|
| -virtual void RateLimitOffscreenContextCHROMIUM() OVERRIDE;
|
| +virtual void RateLimitOffscreenContextCHROMIUM() override;
|
|
|
| virtual void GetMultipleIntegervCHROMIUM(const GLenum* pnames,
|
| GLuint count,
|
| GLint* results,
|
| - GLsizeiptr size) OVERRIDE;
|
| + GLsizeiptr size) override;
|
|
|
| virtual void GetProgramInfoCHROMIUM(GLuint program,
|
| GLsizei bufsize,
|
| GLsizei* size,
|
| - void* info) OVERRIDE;
|
| + void* info) override;
|
|
|
| -virtual GLuint CreateStreamTextureCHROMIUM(GLuint texture) OVERRIDE;
|
| +virtual GLuint CreateStreamTextureCHROMIUM(GLuint texture) override;
|
|
|
| virtual GLuint CreateImageCHROMIUM(GLsizei width,
|
| GLsizei height,
|
| GLenum internalformat,
|
| - GLenum usage) OVERRIDE;
|
| + GLenum usage) override;
|
|
|
| -virtual void DestroyImageCHROMIUM(GLuint image_id) OVERRIDE;
|
| +virtual void DestroyImageCHROMIUM(GLuint image_id) override;
|
|
|
| virtual void GetImageParameterivCHROMIUM(GLuint image_id,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| virtual GLuint CreateGpuMemoryBufferImageCHROMIUM(GLsizei width,
|
| GLsizei height,
|
| GLenum internalformat,
|
| - GLenum usage) OVERRIDE;
|
| + GLenum usage) override;
|
|
|
| virtual void GetTranslatedShaderSourceANGLE(GLuint shader,
|
| GLsizei bufsize,
|
| GLsizei* length,
|
| - char* source) OVERRIDE;
|
| + char* source) override;
|
|
|
| virtual void PostSubBufferCHROMIUM(GLint x,
|
| GLint y,
|
| GLint width,
|
| - GLint height) OVERRIDE;
|
| + GLint height) override;
|
|
|
| virtual void TexImageIOSurface2DCHROMIUM(GLenum target,
|
| GLsizei width,
|
| GLsizei height,
|
| GLuint ioSurfaceId,
|
| - GLuint plane) OVERRIDE;
|
| + GLuint plane) override;
|
|
|
| virtual void CopyTextureCHROMIUM(GLenum target,
|
| GLenum source_id,
|
| GLenum dest_id,
|
| GLint level,
|
| GLint internalformat,
|
| - GLenum dest_type) OVERRIDE;
|
| + GLenum dest_type) override;
|
|
|
| virtual void DrawArraysInstancedANGLE(GLenum mode,
|
| GLint first,
|
| GLsizei count,
|
| - GLsizei primcount) OVERRIDE;
|
| + GLsizei primcount) override;
|
|
|
| virtual void DrawElementsInstancedANGLE(GLenum mode,
|
| GLsizei count,
|
| GLenum type,
|
| const void* indices,
|
| - GLsizei primcount) OVERRIDE;
|
| + GLsizei primcount) override;
|
|
|
| -virtual void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) OVERRIDE;
|
| +virtual void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) override;
|
|
|
| -virtual void GenMailboxCHROMIUM(GLbyte* mailbox) OVERRIDE;
|
| +virtual void GenMailboxCHROMIUM(GLbyte* mailbox) override;
|
|
|
| virtual void ProduceTextureCHROMIUM(GLenum target,
|
| - const GLbyte* mailbox) OVERRIDE;
|
| + const GLbyte* mailbox) override;
|
|
|
| virtual void ProduceTextureDirectCHROMIUM(GLuint texture,
|
| GLenum target,
|
| - const GLbyte* mailbox) OVERRIDE;
|
| + const GLbyte* mailbox) override;
|
|
|
| virtual void ConsumeTextureCHROMIUM(GLenum target,
|
| - const GLbyte* mailbox) OVERRIDE;
|
| + const GLbyte* mailbox) override;
|
|
|
| virtual GLuint CreateAndConsumeTextureCHROMIUM(GLenum target,
|
| - const GLbyte* mailbox) OVERRIDE;
|
| + const GLbyte* mailbox) override;
|
|
|
| virtual void BindUniformLocationCHROMIUM(GLuint program,
|
| GLint location,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| -virtual void BindTexImage2DCHROMIUM(GLenum target, GLint imageId) OVERRIDE;
|
| +virtual void BindTexImage2DCHROMIUM(GLenum target, GLint imageId) override;
|
|
|
| -virtual void ReleaseTexImage2DCHROMIUM(GLenum target, GLint imageId) OVERRIDE;
|
| +virtual void ReleaseTexImage2DCHROMIUM(GLenum target, GLint imageId) override;
|
|
|
| -virtual void TraceBeginCHROMIUM(const char* name) OVERRIDE;
|
| +virtual void TraceBeginCHROMIUM(const char* name) override;
|
|
|
| -virtual void TraceEndCHROMIUM() OVERRIDE;
|
| +virtual void TraceEndCHROMIUM() override;
|
|
|
| virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
|
| GLint level,
|
| @@ -691,7 +691,7 @@ virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - const void* data) OVERRIDE;
|
| + const void* data) override;
|
|
|
| virtual void AsyncTexImage2DCHROMIUM(GLenum target,
|
| GLint level,
|
| @@ -701,25 +701,25 @@ virtual void AsyncTexImage2DCHROMIUM(GLenum target,
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - const void* pixels) OVERRIDE;
|
| + const void* pixels) override;
|
|
|
| -virtual void WaitAsyncTexImage2DCHROMIUM(GLenum target) OVERRIDE;
|
| +virtual void WaitAsyncTexImage2DCHROMIUM(GLenum target) override;
|
|
|
| -virtual void WaitAllAsyncTexImage2DCHROMIUM() OVERRIDE;
|
| +virtual void WaitAllAsyncTexImage2DCHROMIUM() override;
|
|
|
| virtual void DiscardFramebufferEXT(GLenum target,
|
| GLsizei count,
|
| - const GLenum* attachments) OVERRIDE;
|
| + const GLenum* attachments) override;
|
|
|
| -virtual void LoseContextCHROMIUM(GLenum current, GLenum other) OVERRIDE;
|
| +virtual void LoseContextCHROMIUM(GLenum current, GLenum other) override;
|
|
|
| -virtual GLuint InsertSyncPointCHROMIUM() OVERRIDE;
|
| +virtual GLuint InsertSyncPointCHROMIUM() override;
|
|
|
| -virtual void WaitSyncPointCHROMIUM(GLuint sync_point) OVERRIDE;
|
| +virtual void WaitSyncPointCHROMIUM(GLuint sync_point) override;
|
|
|
| -virtual void DrawBuffersEXT(GLsizei count, const GLenum* bufs) OVERRIDE;
|
| +virtual void DrawBuffersEXT(GLsizei count, const GLenum* bufs) override;
|
|
|
| -virtual void DiscardBackbufferCHROMIUM() OVERRIDE;
|
| +virtual void DiscardBackbufferCHROMIUM() override;
|
|
|
| virtual void ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,
|
| GLenum plane_transform,
|
| @@ -731,10 +731,10 @@ virtual void ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,
|
| GLfloat uv_x,
|
| GLfloat uv_y,
|
| GLfloat uv_width,
|
| - GLfloat uv_height) OVERRIDE;
|
| + GLfloat uv_height) override;
|
|
|
| -virtual void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) OVERRIDE;
|
| +virtual void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override;
|
|
|
| -virtual void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) OVERRIDE;
|
| +virtual void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override;
|
|
|
| #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_
|
|
|