commit 4c03fa69a386e80f857521b51834b5eb28fbe1f3
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jun 24 13:02:16 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jun 24 13:02:16 2010 +0000
tree 98700272fa8bcb0082912ab84c6f7351ee8aa07a
parent 353569a9ca0b3cf9905c229494cc175bd7d6fae5

Fix NPOT completeness rule.

TRAC #12561

Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch

Author:    Andrew Lewycky

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

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index cbebcbf..4079d43 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -427,8 +427,8 @@
     }
     else
     {
-        // One of the restrictions of NONPOW2CONDITIONAL is that NPOTs may only have a single level.
-        return (getContext()->getDeviceCaps().TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) ? 1 : maxlevel;
+        // OpenGL ES 2.0 without GL_OES_texture_npot does not permit NPOT mipmaps.
+        return 1;
     }
 }
 
@@ -635,7 +635,7 @@
         return false;
     }
 
-    bool mipmapping;
+    bool mipmapping = false;
 
     switch (mMinFilter)
     {
@@ -652,10 +652,15 @@
      default: UNREACHABLE();
     }
 
+    if ((getWrapS() != GL_CLAMP_TO_EDGE && !isPow2(width))
+        || (getWrapT() != GL_CLAMP_TO_EDGE && !isPow2(height)))
+    {
+        return false;
+    }
+
     if (mipmapping)
     {
-        if ((getWrapS() != GL_CLAMP_TO_EDGE && !isPow2(width))
-            || (getWrapT() != GL_CLAMP_TO_EDGE && !isPow2(height)))
+        if (!isPow2(width) || !isPow2(height))
         {
             return false;
         }