Attachment 16631 Details for Bug 13044 – better fix

[patch] better fix

fix_rotation.diff (text/plain), 1.72 KB, created by Alex Deucher on 2008-05-19 13:46:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2008-05-19 13:46:33 UTC

Size: 1.72 KB

patch

obsolete

>diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
>index f519a3e..cc2aea1 100644
>--- a/src/radeon_exa_render.c
>+++ b/src/radeon_exa_render.c
>@@ -938,7 +938,11 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
> 
> #ifdef ONLY_ONCE
> 
>-static Bool R300CheckCompositeTexture(PicturePtr pPict, int unit, Bool is_r500)
>+static Bool R300CheckCompositeTexture(PicturePtr pPict,
>+				      PicturePtr pDstPict,
>+				      int op,
>+				      int unit,
>+				      Bool is_r500)
> {
>     int w = pPict->pDrawable->width;
>     int h = pPict->pDrawable->height;
>@@ -980,8 +984,12 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, int unit, Bool is_r500)
>      * matter. I have not, however, verified that the X server always does such
>      * clipping.
>      */
>-    if (pPict->transform != 0 && !pPict->repeat && PICT_FORMAT_A(pPict->format) == 0)
>-	RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
>+    if (pPict->transform != 0 && !pPict->repeat && PICT_FORMAT_A(pPict->format) == 0) {
>+	if ((op == PictOpSrc) && (PICT_FORMAT_A(pDstPict->format) == 0))
>+	    return TRUE;
>+	else
>+	    RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
>+    }
> 
>     return TRUE;
> }
>@@ -1157,11 +1165,11 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
> 	    }
> 	}
> 
>-	if (!R300CheckCompositeTexture(pMaskPicture, 1, IS_R500_3D))
>+	if (!R300CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1, IS_R500_3D))
> 	    return FALSE;
>     }
> 
>-    if (!R300CheckCompositeTexture(pSrcPicture, 0, IS_R500_3D))
>+    if (!R300CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0, IS_R500_3D))
> 	return FALSE;
> 
>     if (!R300GetDestFormat(pDstPicture, &tmp1))

Actions: View | Splinter Review

Attachments on bug 13044: 12311 | 12312 | 14737 | 14738 | 16529 | 16530 | 16531 | 16532 | 16533 | 16534 | 16551 | 16552 | 16625 | 16631

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.