commit 0c8abca13231c5e7399a6019f61dbbeea6c30e57
author Jamie Madill <jmadill@chromium.org> Fri Jul 22 20:21:26 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Sat Jul 23 04:52:11 2016 +0000
tree 878421bc5e681566442e29b46698145d8613ab5c
parent a3944d4f493f9473f858b9206940ce1a0031be21

Fix CopyTexSubImage validation.

Now that we preserve the sized-ness information, we can validate
CopyTexSubImage and related methods correctly.

Fixed a lot of WebGL 2 tests when using ANGLE.

BUG=angleproject:1228

Change-Id: I959322c0a9bb16a2f16d60dce7cd1e63ca95b45a
Reviewed-on: https://chromium-review.googlesource.com/362618
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index ab575f1..1bbfe86 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1649,7 +1649,7 @@
                                         GLsizei width,
                                         GLsizei height,
                                         GLint border,
-                                        GLenum *textureFormatOut)
+                                        Format *textureFormatOut)
 {
     if (level < 0 || xoffset < 0 || yoffset < 0 || zoffset < 0 || width < 0 || height < 0)
     {
@@ -1786,7 +1786,10 @@
         }
     }
 
-    *textureFormatOut = texture->getFormat(target, level).asSized();
+    if (textureFormatOut)
+    {
+        *textureFormatOut = texture->getFormat(target, level);
+    }
     return true;
 }