xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 fb/fbwindow.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7798f3abce3f6aaafd4864148aafbad9d3bc343d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri May 29 13:10:47 2009 -0700

    fb: Use the correct planemask in fbFillRegionTiled.

diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index a5cfc34..e943853 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -282,11 +282,7 @@ fbFillRegionTiled (DrawablePtr	pDrawable,
     BoxPtr	pbox = REGION_RECTS(pRegion);
     int		xRot = pDrawable->x;
     int		yRot = pDrawable->y;
-#ifdef ROOTLESS_SAFEALPHA
-    FbBits planeMask = FB_ALLONES & ~RootlessAlphaMask(dstBpp);
-#else
-    FbBits planeMask = FB_ALLONES;
-#endif
+    FbBits	planeMask;
     
 #ifdef PANORAMIX
     if(!noPanoramiXExtension) 
@@ -305,6 +301,12 @@ fbFillRegionTiled (DrawablePtr	pDrawable,
     tileHeight = pTile->drawable.height;
     xRot += dstXoff;
     yRot += dstYoff;
+
+#ifdef ROOTLESS_SAFEALPHA
+    planeMask = FB_ALLONES & ~RootlessAlphaMask(dstBpp);
+#else
+    planeMask = FB_ALLONES;
+#endif
     
     while (n--)
     {