Fix the dstMap for rgb888 and bgr888 texture formats, which are the

opposite to what you'd naively expect.

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 8456273dbb1b15042edb038671bb82e2d7309a05..394c70190b313f209aed6b5c52f21834e3b7a784 100644 (file)
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1668,9 +1668,9 @@ _mesa_texstore_rgb888(TEXSTORE_PARAMS)
 
       /* dstmap - how to swizzle from RGBA to dst format:
        */
-      dstmap[0] = 0;
+      dstmap[0] = 2;
       dstmap[1] = 1;
-      dstmap[2] = 2;
+      dstmap[2] = 0;
       dstmap[3] = ONE;         /* ? */
       
       _mesa_swizzle_ubyte_image(ctx, dims,
@@ -1794,9 +1794,9 @@ _mesa_texstore_bgr888(TEXSTORE_PARAMS)
 
       /* dstmap - how to swizzle from RGBA to dst format:
        */
-      dstmap[0] = 2;
+      dstmap[0] = 0;
       dstmap[1] = 1;
-      dstmap[2] = 0;
+      dstmap[2] = 2;
       dstmap[3] = ONE;         /* ? */
       
       _mesa_swizzle_ubyte_image(ctx, dims,