commit c1f8b16bd24f7caa6abb2edd5f20079b7a63dfc0
author Jamie Madill <jmadill@chromium.org> Mon Oct 07 10:46:38 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Tue Oct 08 14:27:39 2013 -0400
tree 767fc2290ce3bc5292b3c8d55bd63e72772de08b
parent 35d1501b7bcbacd7af96a65a52fb545c772e41bf

Move validation of API errors out of Texture*::generateMipmaps() to the API.

TRAC #23959

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index fff0994..fb805c8 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2223,6 +2223,23 @@
                 return gl::error(GL_INVALID_OPERATION);
             }
 
+            // Non-power of 2 ES2 check
+            if (!context->supportsNonPower2Texture() && (!gl::isPow2(texture->getBaseLevelWidth()) || !gl::isPow2(texture->getBaseLevelHeight())))
+            {
+                ASSERT(context->getClientVersion() <= 2 && (target == GL_TEXTURE_2D || target == GL_TEXTURE_CUBE_MAP));
+                return gl::error(GL_INVALID_OPERATION);
+            }
+
+            // Cube completeness check
+            if (target == GL_TEXTURE_CUBE_MAP)
+            {
+                gl::TextureCubeMap *textureCube = static_cast<gl::TextureCubeMap *>(texture);
+                if (!textureCube->isCubeComplete())
+                {
+                    return gl::error(GL_INVALID_OPERATION);
+                }
+            }
+
             texture->generateMipmaps();
         }
     }