commit 8509d86e9b65754823aa6bab5ea6f1d9b5359435
author Geoff Lang <geofflang@chromium.org> Wed May 20 14:06:13 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Thu May 21 13:30:04 2015 +0000
tree 962beb0ed794f1d51b9ab83d232220927cf06a44
parent a30c78ae3160d49c5ac1a0f08b566e4564f0af36

Pipe the imageSize parameter from the entry point to avoid recomputation.

BUG=angleproject:884

Change-Id: Ic4d5bdc5b65ebcb8c57b960e84708e945db0276a
Reviewed-on: https://chromium-review.googlesource.com/272422
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Texture.cpp

diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
index 4d4c32a..8b18663 100644
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -190,14 +190,14 @@
 }
 
 Error Texture::setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const Extents &size,
-                                  const PixelUnpackState &unpack, const uint8_t *pixels)
+                                  const PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels)
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
 
     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
     releaseTexImageInternal();
 
-    Error error = mTexture->setCompressedImage(target, level, internalFormat, size, unpack, pixels);
+    Error error = mTexture->setCompressedImage(target, level, internalFormat, size, unpack, imageSize, pixels);
     if (error.isError())
     {
         return error;
@@ -209,11 +209,11 @@
 }
 
 Error Texture::setCompressedSubImage(GLenum target, size_t level, const Box &area, GLenum format,
-                                     const PixelUnpackState &unpack, const uint8_t *pixels)
+                                     const PixelUnpackState &unpack, size_t imageSize, const uint8_t *pixels)
 {
     ASSERT(target == mTarget || (mTarget == GL_TEXTURE_CUBE_MAP && IsCubeMapTextureTarget(target)));
 
-    return mTexture->setCompressedSubImage(target, level, area, format, unpack, pixels);
+    return mTexture->setCompressedSubImage(target, level, area, format, unpack, imageSize, pixels);
 }
 
 Error Texture::copyImage(GLenum target, size_t level, const Rectangle &sourceArea, GLenum internalFormat,