Skip to content

A
angle
Commit bf6e5d4d by daniel@transgaming.com
Options

Remove the unused Texture::getType method

Issue=306 Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@1077 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 2ccbbef1
Showing with 0 additions and 13 deletions
src/libGLESv2/Texture.cpp
...@@ -1807,11 +1807,6 @@ GLenum Texture2D::getInternalFormat() const ...@@ -1807,11 +1807,6 @@ GLenum Texture2D::getInternalFormat() const
return mImageArray[0].getFormat(); return mImageArray[0].getFormat();
} }
GLenum Texture2D::getType() const
{
return mImageArray[0].getType();
}
D3DFORMAT Texture2D::getD3DFormat() const D3DFORMAT Texture2D::getD3DFormat() const
{ {
return mImageArray[0].getD3DFormat(); return mImageArray[0].getD3DFormat();
...@@ -2503,11 +2498,6 @@ GLenum TextureCubeMap::getInternalFormat() const ...@@ -2503,11 +2498,6 @@ GLenum TextureCubeMap::getInternalFormat() const
return mImageArray[0][0].getFormat(); return mImageArray[0][0].getFormat();
} }
GLenum TextureCubeMap::getType() const
{
return mImageArray[0][0].getType();
}
D3DFORMAT TextureCubeMap::getD3DFormat() const D3DFORMAT TextureCubeMap::getD3DFormat() const
{ {
return mImageArray[0][0].getD3DFormat(); return mImageArray[0][0].getD3DFormat();
......
src/libGLESv2/Texture.h
...@@ -195,7 +195,6 @@ class Texture : public RefCountObject ...@@ -195,7 +195,6 @@ class Texture : public RefCountObject
virtual GLsizei getWidth(GLint level) const = 0; virtual GLsizei getWidth(GLint level) const = 0;
virtual GLsizei getHeight(GLint level) const = 0; virtual GLsizei getHeight(GLint level) const = 0;
virtual GLenum getInternalFormat() const = 0; virtual GLenum getInternalFormat() const = 0;
virtual GLenum getType() const = 0;
virtual D3DFORMAT getD3DFormat() const = 0; virtual D3DFORMAT getD3DFormat() const = 0;
virtual bool isSamplerComplete() const = 0; virtual bool isSamplerComplete() const = 0;
...@@ -291,7 +290,6 @@ class Texture2D : public Texture ...@@ -291,7 +290,6 @@ class Texture2D : public Texture
virtual GLsizei getWidth(GLint level) const; virtual GLsizei getWidth(GLint level) const;
virtual GLsizei getHeight(GLint level) const; virtual GLsizei getHeight(GLint level) const;
virtual GLenum getInternalFormat() const; virtual GLenum getInternalFormat() const;
virtual GLenum getType() const;
virtual D3DFORMAT getD3DFormat() const; virtual D3DFORMAT getD3DFormat() const;
void setImage(GLint level, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels); void setImage(GLint level, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels);
...@@ -374,7 +372,6 @@ class TextureCubeMap : public Texture ...@@ -374,7 +372,6 @@ class TextureCubeMap : public Texture
virtual GLsizei getWidth(GLint level) const; virtual GLsizei getWidth(GLint level) const;
virtual GLsizei getHeight(GLint level) const; virtual GLsizei getHeight(GLint level) const;
virtual GLenum getInternalFormat() const; virtual GLenum getInternalFormat() const;
virtual GLenum getType() const;
virtual D3DFORMAT getD3DFormat() const; virtual D3DFORMAT getD3DFormat() const;
void setImagePosX(GLint level, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels); void setImagePosX(GLint level, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels);
......
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