commit f1286449451176f824d1df5425d6f482308f1f21
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Nov 29 19:42:23 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Nov 29 19:42:23 2011 +0000
tree ae0b7925b8efebcc2eeed10092e702bd6aedd364
parent 67d72526fa3f25740e758105116d2862e6cf1409

Adds a level parameter to texture getWidth and getHeight

TRAC #18802
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@899 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index a80b32d..5d8ec45 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1036,8 +1036,8 @@
                     return error(GL_INVALID_OPERATION);
                 }
 
-                if ((width % 4 != 0 && width != texture->getWidth()) || 
-                    (height % 4 != 0 && height != texture->getHeight()))
+                if ((width % 4 != 0 && width != texture->getWidth(0)) || 
+                    (height % 4 != 0 && height != texture->getHeight(0)))
                 {
                     return error(GL_INVALID_OPERATION);
                 }
@@ -1058,8 +1058,8 @@
                     return error(GL_INVALID_OPERATION);
                 }
 
-                if ((width % 4 != 0 && width != texture->getWidth()) || 
-                    (height % 4 != 0 && height != texture->getHeight()))
+                if ((width % 4 != 0 && width != texture->getWidth(0)) || 
+                    (height % 4 != 0 && height != texture->getHeight(0)))
                 {
                     return error(GL_INVALID_OPERATION);
                 }