commit 0efef90c6d8b121846aba0e1016c2d1bfaf3d252
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:21:09 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:21:09 2013 +0000
tree 9af5fe26d6d491d9552fde1e2593ccd225a52fcd
parent f548ff2ad2fb3df817b745199c80b947aa82a520

Updated the error handling of compressed image sizes based on the ANGLE_texture_compression_dxt spec.

TRAC #13332

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

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

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 7340677..cf9e7b4 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1014,7 +1014,17 @@
 
         if (border != 0)
         {
-            return gl::error(GL_INVALID_VALUE);
+            return gl::error(GL_INVALID_OPERATION);
+        }
+
+        if (width != 1 && width != 2 && width % 4 != 0)
+        {
+            return gl::error(GL_INVALID_OPERATION);
+        }
+
+        if (height != 1 && height != 2 && height % 4 != 0)
+        {
+            return gl::error(GL_INVALID_OPERATION);
         }
 
         gl::Context *context = gl::getNonLostContext();