xserver pixman libX11 libXext 14/11/2010

1 files changed, 0 insertions, 125 deletions

diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index 9e2c35c4b..c27fb4e20 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/fb/fbpict.c
@@ -35,112 +35,6 @@
 #include "mipict.h"

 #include "fbpict.h"

 

-#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))

-

-void

-fbWalkCompositeRegion (CARD8 op,

-		       PicturePtr pSrc,

-		       PicturePtr pMask,

-		       PicturePtr pDst,

-		       INT16 xSrc,

-		       INT16 ySrc,

-		       INT16 xMask,

-		       INT16 yMask,

-		       INT16 xDst,

-		       INT16 yDst,

-		       CARD16 width,

-		       CARD16 height,

-		       Bool srcRepeat,

-		       Bool maskRepeat,

-		       CompositeFunc compositeRect)

-{

-    RegionRec	    region;

-    int		    n;

-    BoxPtr	    pbox;

-    int		    w, h, w_this, h_this;

-    int		    x_msk, y_msk, x_src, y_src, x_dst, y_dst;

-    

-    xDst += pDst->pDrawable->x;

-    yDst += pDst->pDrawable->y;

-    if (pSrc->pDrawable)

-    {

-        xSrc += pSrc->pDrawable->x;

-        ySrc += pSrc->pDrawable->y;

-    }

-    if (pMask && pMask->pDrawable)

-    {

-	xMask += pMask->pDrawable->x;

-	yMask += pMask->pDrawable->y;

-    }

-

-    if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, xSrc, ySrc,

-				   xMask, yMask, xDst, yDst, width, height))

-        return;

-    

-    n = RegionNumRects (&region);

-    pbox = RegionRects (&region);

-    while (n--)

-    {

-	h = pbox->y2 - pbox->y1;

-	y_src = pbox->y1 - yDst + ySrc;

-	y_msk = pbox->y1 - yDst + yMask;

-	y_dst = pbox->y1;

-	while (h)

-	{

-	    h_this = h;

-	    w = pbox->x2 - pbox->x1;

-	    x_src = pbox->x1 - xDst + xSrc;

-	    x_msk = pbox->x1 - xDst + xMask;

-	    x_dst = pbox->x1;

-	    if (maskRepeat)

-	    {

-		y_msk = mod (y_msk - pMask->pDrawable->y, pMask->pDrawable->height);

-		if (h_this > pMask->pDrawable->height - y_msk)

-		    h_this = pMask->pDrawable->height - y_msk;

-		y_msk += pMask->pDrawable->y;

-	    }

-	    if (srcRepeat)

-	    {

-		y_src = mod (y_src - pSrc->pDrawable->y, pSrc->pDrawable->height);

-		if (h_this > pSrc->pDrawable->height - y_src)

-		    h_this = pSrc->pDrawable->height - y_src;

-		y_src += pSrc->pDrawable->y;

-	    }

-	    while (w)

-	    {

-		w_this = w;

-		if (maskRepeat)

-		{

-		    x_msk = mod (x_msk - pMask->pDrawable->x, pMask->pDrawable->width);

-		    if (w_this > pMask->pDrawable->width - x_msk)

-			w_this = pMask->pDrawable->width - x_msk;

-		    x_msk += pMask->pDrawable->x;

-		}

-		if (srcRepeat)

-		{

-		    x_src = mod (x_src - pSrc->pDrawable->x, pSrc->pDrawable->width);

-		    if (w_this > pSrc->pDrawable->width - x_src)

-			w_this = pSrc->pDrawable->width - x_src;

-		    x_src += pSrc->pDrawable->x;

-		}

-		(*compositeRect) (op, pSrc, pMask, pDst,

-				  x_src, y_src, x_msk, y_msk, x_dst, y_dst,

-				  w_this, h_this);

-		w -= w_this;

-		x_src += w_this;

-		x_msk += w_this;

-		x_dst += w_this;

-	    }

-	    h -= h_this;

-	    y_src += h_this;

-	    y_msk += h_this;

-	    y_dst += h_this;

-	}

-	pbox++;

-    }

-    RegionUninit(&region);

-}

-

 void

 fbComposite (CARD8      op,

 	     PicturePtr pSrc,

@@ -182,25 +76,6 @@ fbComposite (CARD8      op,
     free_pixman_pict (pDst, dest);

 }

 

-void

-fbCompositeGeneral (CARD8	op,

-		    PicturePtr	pSrc,

-		    PicturePtr	pMask,

-		    PicturePtr	pDst,

-		    INT16	xSrc,

-		    INT16	ySrc,

-		    INT16	xMask,

-		    INT16	yMask,

-		    INT16	xDst,

-		    INT16	yDst,

-		    CARD16	width,

-		    CARD16	height)

-{

-    fbComposite (op, pSrc, pMask, pDst,

-			xSrc, ySrc, xMask, yMask, xDst, yDst,

-			width, height);

-}

-

 static pixman_image_t *

 create_solid_fill_image (PicturePtr pict)

 {