xserver: Branch 'master'

[Adam Jackson]

 fb/fb.h             |    5 ----
 fb/fbwindow.c       |   65 ----------------------------------------------------
 fb/wfbrename.h      |    1 
 hw/kdrive/src/kaa.c |   12 ---------
 4 files changed, 83 deletions(-)

New commits:
commit 24bebdded44a9e184455b4fee7800257fee81efb
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 24 15:07:49 2007 -0500

    fbFillRegionTiled() is now dead code.
    
    Only ever called from the old PaintWindow* screen hooks, but those are
    gone now.  As a pleasant side effect, fb loses its #ifdef PANORAMIX.

diff --git a/fb/fb.h b/fb/fb.h
index 5b56d96..01000d7 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -2087,11 +2087,6 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
 		   FbBits	and,
 		   FbBits	xor);
 
-void
-fbFillRegionTiled (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   PixmapPtr	pTile);
-
 pixman_image_t *image_from_pict (PicturePtr pict,
 				 Bool       has_clip);
 void free_pixman_pict (PicturePtr, pixman_image_t *);
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 89f601f..f6fe8aa 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -250,68 +250,3 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
     
     fbFinishAccess (pDrawable);
 }
-
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
-
-void
-fbFillRegionTiled (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   PixmapPtr	pTile)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    FbBits	*tile;
-    FbStride	tileStride;
-    int		tileBpp;
-    int		tileXoff, tileYoff; /* XXX assumed to be zero */
-    int		tileWidth, tileHeight;
-    int		n = REGION_NUM_RECTS(pRegion);
-    BoxPtr	pbox = REGION_RECTS(pRegion);
-    int		xRot = pDrawable->x;
-    int		yRot = pDrawable->y;
-    
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) 
-    {
-	int index = pDrawable->pScreen->myNum;
-	if(&WindowTable[index]->drawable == pDrawable) 
-	{
-	    xRot -= panoramiXdataPtr[index].x;
-	    yRot -= panoramiXdataPtr[index].y;
-	}
-    }
-#endif
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
-    tileWidth = pTile->drawable.width;
-    tileHeight = pTile->drawable.height;
-    xRot += dstXoff;
-    yRot += dstYoff;
-    
-    while (n--)
-    {
-	fbTile (dst + (pbox->y1 + dstYoff) * dstStride,
-		dstStride,
-		(pbox->x1 + dstXoff) * dstBpp,
-		(pbox->x2 - pbox->x1) * dstBpp,
-		pbox->y2 - pbox->y1,
-		tile,
-		tileStride,
-		tileWidth * dstBpp,
-		tileHeight,
-		GXcopy,
-		FB_ALLONES,
-		dstBpp,
-		xRot * dstBpp,
-		yRot - (pbox->y1 + dstYoff));
-	pbox++;
-    }
-
-    fbFinishAccess (&pTile->drawable);
-    fbFinishAccess (pDrawable);
-}
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 9382244..dc05285 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -79,7 +79,6 @@
 #define fbExpandDirectColors wfbExpandDirectColors
 #define fbFill wfbFill
 #define fbFillRegionSolid wfbFillRegionSolid
-#define fbFillRegionTiled wfbFillRegionTiled
 #define fbFillSpans wfbFillSpans
 #define fbFixCoordModePrevious wfbFixCoordModePrevious
 #define fbGCFuncs wfbGCFuncs
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index e75b083..db09e9d 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -996,18 +996,6 @@ kaaFillRegionSolid (DrawablePtr	pDrawable,
     kaaDrawableDirty (pDrawable);
 }
 
-#if 0
-static void
-kaaFillRegionTiled (DrawablePtr pDrawable,
-		    RegionPtr	pRegion,
-		    Pixmap	pTile)
-{
-    else
-    {
-	kaaWaitSync
-}
-#endif
-
 Bool
 kaaDrawInit (ScreenPtr		pScreen,
 	     KaaScreenInfoPtr	pScreenInfo)