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

Ilia Mirkin imirkin at kemper.freedesktop.org
Sun Aug 20 21:05:11 UTC 2017


Module: Mesa
Branch: master
Commit: 87556a650ad363b41d86f4e25d5c4696f9af4550
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87556a650ad363b41d86f4e25d5c4696f9af4550

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

---

 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 7bcd734204..e5dc469437 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 */




More information about the mesa-commit mailing list