commit 07bb8cf4f5d734c9ba15adadf5a765fa22cf25ce
author Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:44 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:44 2013 -0400
tree 40a30e89113121080b1c396030bb81c0b2da6038
parent 51a943707572a8ba132bae05095af4855c8939e9

Remove Texture::levelCount() and replace it with isValidLevel().

TRAC #23978

Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang

src/libGLESv2/Texture.h

diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h
index cb165df..501d031 100644
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -191,7 +191,6 @@
     friend class RenderbufferTexture2D;
     rx::RenderTarget *getRenderTarget(GLint level);
     rx::RenderTarget *getDepthSencil(GLint level);
-    virtual int levelCount();
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture2D);
@@ -206,6 +205,7 @@
     virtual const rx::Image *getBaseLevelImage() const;
 
     bool isMipmapComplete() const;
+    bool isValidLevel(int level) const;
     bool isLevelComplete(int level) const;
     void updateStorageLevel(int level);
 
@@ -261,7 +261,6 @@
     friend class RenderbufferTextureCubeMap;
     rx::RenderTarget *getRenderTarget(GLenum target, GLint level);
     rx::RenderTarget *getDepthStencil(GLenum target, GLint level);
-    virtual int levelCount();
 
   private:
     DISALLOW_COPY_AND_ASSIGN(TextureCubeMap);
@@ -276,6 +275,7 @@
     virtual const rx::Image *getBaseLevelImage() const;
 
     bool isMipmapCubeComplete() const;
+    bool isValidFaceLevel(int faceIndex, int level) const;
     bool isFaceLevelComplete(int faceIndex, int level) const;
     void updateStorageFaceLevel(int faceIndex, int level);
 
@@ -323,7 +323,6 @@
     rx::RenderTarget *getRenderTarget(GLint level);
     rx::RenderTarget *getRenderTarget(GLint level, GLint layer);
     rx::RenderTarget *getDepthStencil(GLint level, GLint layer);
-    virtual int levelCount();
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture3D);
@@ -341,6 +340,7 @@
     void redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
     void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
 
+    bool isValidLevel(int level) const;
     bool isLevelComplete(int level) const;
     void updateStorageLevel(int level);
 
@@ -383,7 +383,6 @@
     friend class RenderbufferTexture2DArrayLayer;
     rx::RenderTarget *getRenderTarget(GLint level, GLint layer);
     rx::RenderTarget *getDepthStencil(GLint level, GLint layer);
-    virtual int levelCount();
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture2DArray);
@@ -402,6 +401,7 @@
     void redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
     void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint layerTarget, GLsizei width, GLsizei height);
 
+    bool isValidLevel(int level) const;
     bool isLevelComplete(int level) const;
     void updateStorageLevel(int level);