From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed, 13 Feb 2008 07:57:44 +0000 (+0800)
Subject: _mesa_swizzle_ubyt_image: Don't use single swizzle_copy call
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e45e33854289222cabb491d4605bf381b1631054;p=mesa.git

_mesa_swizzle_ubyt_image: Don't use single swizzle_copy call
if components don't match. fix #13508
---

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index a8e639be6d6..37d6f81c8b9 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -809,6 +809,7 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
 /*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
 
    if (srcRowStride == dstRowStride &&
+       srcComponents == dstComponents &&
        srcRowStride == srcWidth * srcComponents &&
        dimensions < 3) {
       /* 1 and 2D images only */