Tue Apr 3 14:54:45 UTC 2012

1 files changed, 0 insertions, 179 deletions

diff --git a/extra/xorg-server/revert-trapezoids.patch b/extra/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/extra/xorg-server/revert-trapezoids.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ru a/fb/fbpict.c b/fb/fbpict.c
---- a/fb/fbpict.c	2011-08-01 01:44:24.000000000 +0200
-+++ b/fb/fbpict.c	2011-10-05 22:45:29.000000000 +0200
-@@ -364,7 +364,7 @@
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-+    ps->Trapezoids = miTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
-     ps->Triangles = fbTriangles;
-diff -ru a/render/mipict.c b/render/mipict.c
---- a/render/mipict.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.c	2011-10-05 22:02:53.000000000 +0200
-@@ -573,6 +573,67 @@
-     }
- }
- 
-+void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+	PicturePtr	pPicture;
-+	BoxRec		bounds;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = traps[0].left.p1.x >> 16;
-+	yDst = traps[0].left.p1.y >> 16;
-+
-+	miTrapezoidBounds (ntrap, traps, &bounds);
-+	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+				       -bounds.x1, -bounds.y1);
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1,
-+			  bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	for (; ntrap; ntrap--, traps++)
-+	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-+
- Bool
- miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
- {
-@@ -599,7 +660,7 @@
-     ps->Composite	= 0;			/* requires DDX support */
-     ps->Glyphs		= miGlyphs;
-     ps->CompositeRects	= miCompositeRects;
--    ps->Trapezoids	= 0;
-+    ps->Trapezoids	= miTrapezoids;
-     ps->Triangles	= 0;
-     
-     ps->RasterizeTrapezoid = 0;			/* requires DDX support */
-diff -ru a/render/mipict.h b/render/mipict.h
---- a/render/mipict.h	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.h	2011-10-05 22:06:19.000000000 +0200
-@@ -129,6 +129,23 @@
- 		      CARD32	    pixel,
- 		      xRenderColor  *color);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
-+extern _X_EXPORT void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps);
-+
- extern _X_EXPORT Bool
- miIsSolidAlpha (PicturePtr pSrc);
- 
-diff -ru a/render/mitrap.c b/render/mitrap.c
---- a/render/mitrap.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mitrap.c	2011-10-05 22:05:29.000000000 +0200
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
- {
-