Mesa (17.1): mesa: only copy requested compressed teximage cubemap faces

[Andres Gomez]

Module: Mesa
Branch: 17.1
Commit: 4fce4ce271b42357df50ef6d62a1481e41655f00
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4fce4ce271b42357df50ef6d62a1481e41655f00

Author: Christoph Haag <haagch at frickel.club>
Date:   Sun Aug 20 01:59:43 2017 +0200

mesa: only copy requested compressed teximage cubemap faces

This is analogous to commit 2259b11 which only fixed the regular case

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102308
Signed-off-by: Christoph Haag <haagch+mesadev at frickel.club>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 87556a650ad363b41d86f4e25d5c4696f9af4550)
[Andres Gomez: helpers had not yet been refactored]
Signed-off-by: Andres Gomez <agomez at igalia.com>

Conflicts:
	src/mesa/main/teximage.c

---

 src/mesa/main/teximage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 1a00d25132..1e18b99d67 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4766,13 +4766,13 @@ _mesa_CompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset,
       }
 
       /* Copy in each face. */
-      for (i = 0; i < 6; ++i) {
+      for (i = zoffset; i < zoffset + depth; ++i) {
          texImage = texObj->Image[i][level];
          assert(texImage);
 
          _mesa_compressed_texture_sub_image(ctx, 3, texObj, texImage,
                                             texObj->Target, level,
-                                            xoffset, yoffset, zoffset,
+                                            xoffset, yoffset, 0,
                                             width, height, 1,
                                             format, imageSize, pixels);