summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2006-12-14 15:20:15 -0700
committerBrian <brian@yutani.localnet.net>2006-12-14 15:20:15 -0700
commit0ae74048355497ebca4f606e01311a659db6c120 (patch)
treefb31ca9bf1d8d42500a41488bdc8bd22308a5924 /src/mesa/main
parent5cc12925089ba705e4f0af9649bc30b546d900ff (diff)
parentfde908444af5c826bce84203a9cb4273d8341ed0 (diff)
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texstore.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 89563842c2..87f8fa7a0d 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