commit cc507aa0efca2cae35ddc257092e5ceacb7570c9
author Geoff Lang <geofflang@chromium.org> Mon Dec 12 10:09:52 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Dec 12 18:00:53 2016 +0000
tree e42a22c1a10894303c3c70d5412b2da1053d3bc6
parent 36fd100d480e51c742ed7cf95f82876b016c998d

Make the NPOT extension requestable. Fix NPOT validation in CopyTexImage.

BUG=angleproject:1523
BUG=668223
TEST=conformance/more/functions/copyTexImage2DBadArgs.html

Change-Id: I5fbf4f99fa941c356ecb57d67dd47a33741ce189
Reviewed-on: https://chromium-review.googlesource.com/418944
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index ea3bbf9..f60959a 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -740,6 +740,12 @@
         return false;
     }
 
+    if (!ValidImageSizeParameters(context, target, level, width, height, 1, isSubImage))
+    {
+        context->handleError(Error(GL_INVALID_VALUE, "Invalid texture dimensions."));
+        return false;
+    }
+
     Format textureFormat = Format::Invalid();
     if (!ValidateCopyTexImageParametersBase(context, target, level, internalformat, isSubImage,
                                             xoffset, yoffset, 0, x, y, width, height, border,