Skip to content

A
angle
Commit d976b584 by daniel@transgaming.com
Options

Consistently use the virtual keyword on virtual overloaded methods.

TRAC #16118 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@596 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent db7cd0b2
Showing with 14 additions and 14 deletions
src/libGLESv2/IndexDataManager.h
...@@ -59,8 +59,8 @@ class StreamingIndexBuffer : public IndexBuffer ...@@ -59,8 +59,8 @@ class StreamingIndexBuffer : public IndexBuffer
StreamingIndexBuffer(IDirect3DDevice9 *device, UINT initialSize, D3DFORMAT format); StreamingIndexBuffer(IDirect3DDevice9 *device, UINT initialSize, D3DFORMAT format);
~StreamingIndexBuffer(); ~StreamingIndexBuffer();
void *map(UINT requiredSpace, UINT *offset); virtual void *map(UINT requiredSpace, UINT *offset);
void reserveSpace(UINT requiredSpace, GLenum type); virtual void reserveSpace(UINT requiredSpace, GLenum type);
private: private:
UINT mWritePosition; UINT mWritePosition;
...@@ -72,8 +72,8 @@ class StaticIndexBuffer : public IndexBuffer ...@@ -72,8 +72,8 @@ class StaticIndexBuffer : public IndexBuffer
explicit StaticIndexBuffer(IDirect3DDevice9 *device); explicit StaticIndexBuffer(IDirect3DDevice9 *device);
~StaticIndexBuffer(); ~StaticIndexBuffer();
void *map(UINT requiredSpace, UINT *offset); virtual void *map(UINT requiredSpace, UINT *offset);
void reserveSpace(UINT requiredSpace, GLenum type); virtual void reserveSpace(UINT requiredSpace, GLenum type);
bool lookupType(GLenum type); bool lookupType(GLenum type);
UINT lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex); // Returns the offset into the index buffer, or -1 if not found UINT lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex); // Returns the offset into the index buffer, or -1 if not found
......
src/libGLESv2/Shader.h
...@@ -127,8 +127,8 @@ class VertexShader : public Shader ...@@ -127,8 +127,8 @@ class VertexShader : public Shader
~VertexShader(); ~VertexShader();
GLenum getType(); virtual GLenum getType();
void compile(); virtual void compile();
int getSemanticIndex(const std::string &attributeName); int getSemanticIndex(const std::string &attributeName);
private: private:
...@@ -146,8 +146,8 @@ class FragmentShader : public Shader ...@@ -146,8 +146,8 @@ class FragmentShader : public Shader
~FragmentShader(); ~FragmentShader();
GLenum getType(); virtual GLenum getType();
void compile(); virtual void compile();
private: private:
DISALLOW_COPY_AND_ASSIGN(FragmentShader); DISALLOW_COPY_AND_ASSIGN(FragmentShader);
......
src/libGLESv2/Texture.h
...@@ -193,7 +193,7 @@ class Texture2D : public Texture ...@@ -193,7 +193,7 @@ class Texture2D : public Texture
~Texture2D(); ~Texture2D();
GLenum getTarget() const; virtual GLenum getTarget() const;
virtual GLsizei getWidth() const; virtual GLsizei getWidth() const;
virtual GLsizei getHeight() const; virtual GLsizei getHeight() const;
...@@ -207,8 +207,8 @@ class Texture2D : public Texture ...@@ -207,8 +207,8 @@ class Texture2D : public Texture
void copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source); void copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source);
void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source); void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source);
bool isComplete() const; virtual bool isComplete() const;
bool isCompressed() const; virtual bool isCompressed() const;
virtual void generateMipmaps(); virtual void generateMipmaps();
...@@ -259,10 +259,10 @@ class TextureCubeMap : public Texture ...@@ -259,10 +259,10 @@ class TextureCubeMap : public Texture
void subImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels); void subImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels);
void subImageCompressed(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels); void subImageCompressed(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels);
void copyImage(GLenum target, GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source); void copyImage(GLenum target, GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source);
void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source); virtual void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source);
bool isComplete() const; virtual bool isComplete() const;
bool isCompressed() const; virtual bool isCompressed() const;
virtual void generateMipmaps(); virtual void generateMipmaps();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment