From: Christoph Haag <haagch@frickel.club>
Date: Sat, 19 Aug 2017 23:59:43 +0000 (+0200)
Subject: mesa: only copy requested compressed teximage cubemap faces
X-Git-Tag: upstream/18.1.0~6747
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87556a650ad363b41d86f4e25d5c4696f9af4550;p=platform%2Fupstream%2Fmesa.git

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@frickel.club>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 7bcd734..e5dc469 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4968,13 +4968,13 @@ compressed_tex_sub_image(unsigned dim, GLenum target, GLuint texture,
       }
 
       /* Copy in each face. */
-      for (int i = 0; i < 6; ++i) {
+      for (int i = zoffset; i < zoffset + depth; ++i) {
          texImage = texObj->Image[i][level];
          assert(texImage);
 
          compressed_texture_sub_image(ctx, 3, texObj, texImage,
                                       texObj->Target, level, xoffset, yoffset,
-                                      zoffset, width, height, 1, format,
+                                      0, width, height, 1, format,
                                       imageSize, pixels);
 
          /* Compressed images don't have a client format */