Author: freetz Date: Wed Feb 8 15:45:39 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- xaa/composite fix from modular tree
---- Files affected:
SOURCES:
X11-compositefastpath.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/X11-compositefastpath.patch
diff -u /dev/null SOURCES/X11-compositefastpath.patch:1.1
--- /dev/null Wed Feb 8 16:45:39 2006
+++ SOURCES/X11-compositefastpath.patch Wed Feb 8 16:45:34 2006
@@ -0,0 +1,30 @@
+--- xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c 3 Jul 2005 08:53:49
-0000 1.10
++++ xc/programs/Xserver/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) ||
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
