Ensure texture level count accounts for lod offset.

CONTRIBUTORS

@@ -39,6 +39,7 @@ Google Inc.
 
 Adobe Systems Inc.
  Alexandru Chiculita
+ Steve Minns
  Max Vujovic
 
 Autodesk, Inc.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1274
+#define BUILD_REVISION 1275
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Texture.cpp

@@ -1357,9 +1357,9 @@ GLint Texture::creationLevels(GLsizei size) const
     return creationLevels(size, size);
 }
 
-int Texture::levelCount() const
+int Texture::levelCount()
 {
-    return getBaseTexture() ? getBaseTexture()->GetLevelCount() : 0;
+    return getBaseTexture() ? getBaseTexture()->GetLevelCount() - getLodOffset() : 0;
 }
 
 Blit *Texture::getBlitter()

src/libGLESv2/Texture.h

@@ -227,7 +227,7 @@ class Texture : public RefCountObject
     virtual void convertToRenderTarget() = 0;
     virtual IDirect3DSurface9 *getRenderTarget(GLenum target) = 0;
 
-    int levelCount() const;
+    int levelCount();
 
     static Blit *getBlitter();
     static bool copyToRenderTarget(IDirect3DSurface9 *dest, IDirect3DSurface9 *source, bool fromManaged);