From b623fa9e2d6f97f9febc978c158d790b26e175a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 18 Jun 2008 19:43:06 +0200
Subject: mesa: Fix bug in _mesa_swizzle_ubyte_image

---
 src/mesa/main/texstore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main/texstore.c')

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index d7bfb69443a..519a73b9604 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -823,7 +823,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 == dstRowStride &&
+   if (srcComponents == dstComponents &&
+       srcRowStride == dstRowStride &&
        srcRowStride == srcWidth * srcComponents &&
        dimensions < 3) {
       /* 1 and 2D images only */
-- 
cgit v1.2.3