commit 513558d373d11d18c6a9ce509ed9a5bc5328a2f4
author Jamie Madill <jmadill@chromium.org> Thu Jun 02 13:04:11 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jun 03 20:21:03 2016 +0000
tree ada5556a458c0dde2bfe889b69062b9859f2cc78
parent e2e406c3a4fffc8be04631a6da3934cb180f4349

Pass depth to computeBlockSize.

This was very wrong for 3D textures.

BUG=angleproject:1384

Change-Id: I7f042449e30e1e909778c0524d1ce99d20ddfd65
Reviewed-on: https://chromium-review.googlesource.com/348063
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index d2e4e21..acdffca 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -490,7 +490,7 @@
         }
 
         const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(sizedFormat);
-        auto copyBytesOrErr                  = formatInfo.computeBlockSize(type, width, height);
+        auto copyBytesOrErr = formatInfo.computeBlockSize(type, gl::Extents(width, height, depth));
         if (copyBytesOrErr.isError())
         {
             context->handleError(copyBytesOrErr.getError());
@@ -1557,10 +1557,11 @@
     }
 
     const InternalFormat &formatInfo = GetInternalFormatInfo(internalformat);
-    auto blockSizeOrErr              = formatInfo.computeBlockSize(GL_UNSIGNED_BYTE, width, height);
+    auto blockSizeOrErr =
+        formatInfo.computeBlockSize(GL_UNSIGNED_BYTE, gl::Extents(width, height, depth));
     if (blockSizeOrErr.isError())
     {
-        context->handleError(blockSizeOrErr.getError());
+        context->handleError(Error(GL_INVALID_VALUE));
         return false;
     }
     if (imageSize < 0 || static_cast<GLuint>(imageSize) != blockSizeOrErr.getResult())
@@ -1905,7 +1906,8 @@
     }
 
     const InternalFormat &formatInfo = GetInternalFormatInfo(format);
-    auto blockSizeOrErr              = formatInfo.computeBlockSize(GL_UNSIGNED_BYTE, width, height);
+    auto blockSizeOrErr =
+        formatInfo.computeBlockSize(GL_UNSIGNED_BYTE, gl::Extents(width, height, depth));
     if (blockSizeOrErr.isError())
     {
         context->handleError(blockSizeOrErr.getError());