Attachment 66232 Details for Bug 117163

[patch] Proposed patch for improving XAAComposite Fastpath

xorg-compositefastpath-4320.diff (text/plain), 1.61 KB, created by Matthias Hopf on 2006-02-02 17:56:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2006-02-02 17:56:17 UTC

Size: 1.61 KB

patch

obsolete

>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) ||

Actions: View | Diff

Attachments on bug 117163: 50106 | 63671 | 65931 | 65960 | 66232 | 66252 | 66427