- obsolete

Changed files:
    xorg-xserver-server-compositefastpath.patch -> 1.2

diff --git a/xorg-xserver-server-compositefastpath.patch b/xorg-xserver-server-compositefastpath.patch
deleted file mode 100644 (file)
index d275a68..0000000
--- a/xorg-xserver-server-compositefastpath.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: hw/xfree86/xaa/xaaPict.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xaa/xaaPict.c,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 xaaPict.c
---- hw/xfree86/xaa/xaaPict.c   3 Jul 2005 08:53:49 -0000       1.10
-+++ hw/xfree86/xaa/xaaPict.c   2 Feb 2006 17:33:58 -0000
-@@ -506,12 +506,21 @@ XAAComposite (CARD8      op,
-     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
-     XAA_RENDER_PROLOGUE(pScreen, Composite);
- 
--    if((op == PictOpSrc) && !pMask && infoRec->pScrn->vtSema &&
--      infoRec->ScreenToScreenBitBlt &&
--        pSrc->pDrawable &&
--      DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
--      DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
--      !pSrc->transform && !pSrc->repeat && (pSrc->format == pDst->format))
-+    if(!pMask && infoRec->pScrn->vtSema &&
-+       infoRec->ScreenToScreenBitBlt &&
-+       pSrc->pDrawable &&
-+       DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
-+       DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
-+       !pSrc->transform &&
-+       (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
-+                        xSrc+width<=pSrc->pDrawable->width &&
-+                        ySrc+height<=pSrc->pDrawable->height)) &&
-+       ((op == PictOpSrc && pSrc->format == pDst->format) ||
-+      (op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
-+       ((pSrc->format==PICT_x8r8g8b8 &&
-+         (pDst->format==PICT_x8r8g8b8 || pDst->format==PICT_a8r8g8b8)) ||
-+        (pSrc->format==PICT_x8b8g8r8 &&
-+         (pDst->format==PICT_x8b8g8r8 || pDst->format==PICT_a8b8g8r8))))))
-     {
-       XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);
-     } else if(!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||