Attachment 27562 Details for Bug 22642 – Better fix

[patch] Better fix

fdo22642.diff (text/plain), 1.78 KB, created by Michel Dänzer on 2009-07-10 07:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2009-07-10 07:15:56 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/exa/exa_accel.c b/exa/exa_accel.c
>index 39f3437..5d4c5d5 100644
>--- a/exa/exa_accel.c
>+++ b/exa/exa_accel.c
>@@ -394,6 +394,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
> 
>     if (rects) {
> 	int i;
>+	int ordering;
> 
> 	for (i = 0; i < nbox; i++) {
> 	    rects[i].x = pbox[i].x1 + dx + src_off_x;
>@@ -402,7 +403,14 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
> 	    rects[i].height = pbox[i].y2 - pbox[i].y1;
> 	}
> 
>-	srcregion  = RECTS_TO_REGION(pScreen, nbox, rects, CT_YXBANDED);
>+	/* This must match the miRegionCopy() logic for reversing rect order */
>+	if (nbox == 1 || pDstDrawable != pSrcDrawable ||
>+	    pDstDrawable->type != DRAWABLE_WINDOW || (dx > 0 && dy > 0))
>+	    ordering = CT_YXBANDED;
>+	else
>+	    ordering = CT_UNSORTED;
>+
>+	srcregion  = RECTS_TO_REGION(pScreen, nbox, rects, ordering);
> 	xfree(rects);
> 
> 	if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask,
>@@ -459,8 +467,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
>     exaDoMigration (pixmaps, 2, TRUE);
> 
>     /* Mixed directions must be handled specially if the card is lame */
>-    if ((pExaScr->info->flags & EXA_TWO_BITBLT_DIRECTIONS) &&
>-	reverse != upsidedown) {
>+    if ((pExaScr->info->flags & EXA_TWO_BITBLT_DIRECTIONS) && (dx ^ dy) < 0) {
> 	if (exaCopyNtoNTwoDir(pSrcDrawable, pDstDrawable, pGC, pbox, nbox,
> 			       dx, dy))
> 	    goto out;
>@@ -470,8 +477,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
>     if (exaPixmapIsOffscreen(pDstPixmap)) {
> 	/* Normal blitting. */
> 	if (exaPixmapIsOffscreen(pSrcPixmap)) {
>-	    if (!(*pExaScr->info->PrepareCopy) (pSrcPixmap, pDstPixmap, reverse ? -1 : 1,
>-						upsidedown ? -1 : 1,
>+	    if (!(*pExaScr->info->PrepareCopy) (pSrcPixmap, pDstPixmap, dx, dy,
> 						pGC ? pGC->alu : GXcopy,
> 						pGC ? pGC->planemask : FB_ALLONES)) {
> 		goto fallback;

Actions: View | Splinter Review

Attachments on bug 22642: 27430 | 27431 | 27541 | 27556 | 27558 | 27562 | 27568

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.