commit d4f180b2a52c1a11160a9756e2dbc1586337dd19
author Geoff Lang <geofflang@google.com> Tue Sep 24 13:57:44 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Sep 30 15:45:30 2013 -0400
tree 3f041fd785214580b6d028477e769dd40c987bfc
parent ce6356958ba86c2b09e62e1250cabd6bab16a082

Validate compressed texture dimensions based on the per-format compressed block sizes rather than hard-coded values.

TRAC #23630

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods

src/libGLESv2/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index f5e447c..e72dd0d 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -62,6 +62,25 @@
     return true;
 }
 
+bool ValidCompressedImageSize(const gl::Context *context, GLint internalFormat, GLsizei width, GLsizei height)
+{
+    GLuint clientVersion = context->getClientVersion();
+    if (!IsFormatCompressed(internalFormat, clientVersion))
+    {
+        return false;
+    }
+
+    GLint blockWidth = GetCompressedBlockWidth(internalFormat, clientVersion);
+    GLint blockHeight = GetCompressedBlockHeight(internalFormat, clientVersion);
+    if (width  < 0 || (width  > blockWidth  && width  % blockWidth  != 0) ||
+        height < 0 || (height > blockHeight && height % blockHeight != 0))
+    {
+        return false;
+    }
+
+    return true;
+}
+
 bool ValidateRenderbufferStorageParameters(const gl::Context *context, GLenum target, GLsizei samples,
                                            GLenum internalformat, GLsizei width, GLsizei height,
                                            bool angleExtension)