xserver: Branch 'master'

[Keith Packard]

 miext/shadow/shpacked.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f0b4df99486066ad0e638b3b5debc905bc8ef1c4
Author: Adam Jackson <ajax at redhat.com>
Date:   Sat Sep 11 17:55:57 2010 -0400

    shadow: Optimize shadowUpdatePacked(). (#26973)
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Soren Sandmann <sandmann at daimi.au.dk>
    Reviewed-by: Matt Turner <mattst88 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
index 20d2ea1..06606bc 100644
--- a/miext/shadow/shpacked.c
+++ b/miext/shadow/shpacked.c
@@ -102,8 +102,8 @@ shadowUpdatePacked (ScreenPtr	    pScreen,
 		width -= i;
 		scr += i;
 #define PickBit(a,i)	(((a) >> (i)) & 1)
-		while (i--)
-		    *win++ = *sha++;
+		memcpy(win, sha, i * sizeof(FbBits));
+		sha += i;
 	    }
 	    shaLine += shaStride;
 	    y++;