From 87d26904c383efee0cf50de0215f92909c86bfae Mon Sep 17 00:00:00 2001 From: freetz Date: Tue, 7 Feb 2006 17:19:43 +0000 Subject: [PATCH] - https://bugs.freedesktop.org/show_bug.cgi?id=4320 Changed files: xorg-xserver-server-compositefastpath.patch -> 1.1 --- xorg-xserver-server-compositefastpath.patch | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 xorg-xserver-server-compositefastpath.patch diff --git a/xorg-xserver-server-compositefastpath.patch b/xorg-xserver-server-compositefastpath.patch new file mode 100644 index 0000000..d275a68 --- /dev/null +++ b/xorg-xserver-server-compositefastpath.patch @@ -0,0 +1,35 @@ +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) || -- 2.44.0