From: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu, 14 Dec 2006 09:01:43 +0000 (+0100)
Subject: _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c09259b8bef8f120cc6f4bb1a44f0eae37d71b3;p=mesa.git

_mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.

This fixes texture data corruption with glTexSubimage (and probably glTexImage
under some circumstances) with the texstore swizzle path.
---

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 89563842c25..87f8fa7a0d4 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -808,7 +808,8 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
 
 /*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
 
-   if (srcRowStride == srcWidth * srcComponents &&
+   if (srcRowStride == dstRowStride &&
+       srcRowStride == srcWidth * srcComponents &&
        dimensions < 3) {
       /* 1 and 2D images only */
       GLubyte *dstImage = (GLubyte *) dstAddr