Attachment 6515 Details for Bug 6877 – RENDER support for mach64 - try 7 / EXA

[patch] RENDER support for mach64 - try 7 / EXA

mach64-render-exa-7.patch (text/plain), 1.51 KB, created by George - on 2006-08-10 14:26:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-08-10 14:26:01 UTC

Size: 1.51 KB

patch

obsolete

>diff --git a/exa/exa_render.c b/exa/exa_render.c
>index 2187af8..964356f 100644
>--- a/exa/exa_render.c
>+++ b/exa/exa_render.c
>@@ -469,7 +469,7 @@ exaTryComponentAlphaHelper(CARD8 op,
>     ExaScreenPriv (pDst->pDrawable->pScreen);
> 
>     assert(op == PictOpOver);
>-    assert(pMask->componentAlpha == TRUE);
>+    /* assert(pMask->componentAlpha == TRUE); */
> 
>     if (pExaScr->info->CheckComposite &&
> 	(!(*pExaScr->info->CheckComposite)(PictOpOutReverse, pSrc, pMask,
>@@ -580,16 +580,26 @@ exaComposite(CARD8	op,
> 	(!pMask || !pMask->repeat || pMask->repeat == RepeatNormal) &&
> 	!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
>     {
>+	Bool isSrcSolid;
>+
> 	ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask,
> 				    yMask, xDst, yDst, width, height);
> 	if (ret == 1)
> 	    goto done;
> 
>+	/* For generic masks and solid src pictures, mach64 can do Over in two
>+	 * passes, similar to the component-alpha case.
>+	 */
>+	isSrcSolid = pSrc->pDrawable->width == 1 &&
>+		     pSrc->pDrawable->height == 1 &&
>+		     pSrc->repeat;
>+
> 	/* If we couldn't do the Composite in a single pass, and it was a
> 	 * component-alpha Over, see if we can do it in two passes with
> 	 * an OutReverse and then an Add.
> 	 */
>-	if (ret == -1 && pMask && pMask->componentAlpha && op == PictOpOver) {
>+	if (ret == -1 && op == PictOpOver && pMask &&
>+	    (pMask->componentAlpha || isSrcSolid)) {
> 	    ret = exaTryComponentAlphaHelper(op, pSrc, pMask, pDst, xSrc, ySrc,
> 					     xMask, yMask, xDst, yDst,
> 					     width, height);

Actions: View | Splinter Review

Attachments on bug 6877: 5587 | 5633 | 5652 | 5653 | 5693 | 5714 | 5715 | 5909 | 6192 | 6506 | 6515

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.