xserver: Branch 'master'

[Eric Anholt]

 fb/fbmmx.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 63c169e3b1f7d6a7375a414fcd50cce32358a525 (from ff6b59a0dbadbe61a53e48c23965d3073d95791b)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Tue Jun 27 04:11:47 2006 +0200

    Fix MMX Saturate implementation.
    
    The code was expanding the source blend factor from the wrong channel.  Fixes
    cairo's clip-operator test.

diff --git a/fb/fbmmx.c b/fb/fbmmx.c
index d058ffa..f74930a 100644
--- a/fb/fbmmx.c
+++ b/fb/fbmmx.c
@@ -591,7 +591,7 @@ mmxCombineSaturateU (CARD32 *dest, const
 
         if (sa > da) {
             __m64 msa = load8888(FbIntDiv(da, sa));
-            msa = expand_alpha(msa);
+            msa = expand_alpha_rev(msa);
             ms = pix_multiply(ms, msa);
         }
         md = pix_add(md, ms);