Attachment 31635 Details for Bug 25343 – redo one change

[patch] redo one change

0003-exa-mixed-devKind-doesn-t-have-to-be-set-before-call.patch (text/plain), 1.48 KB, created by Maarten Maathuis on 2009-12-01 12:51:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Maathuis

Created: 2009-12-01 12:51:19 UTC

Size: 1.48 KB

patch

obsolete

>From c8925996a350114b27a598a466286a1c32786862 Mon Sep 17 00:00:00 2001
>From: Maarten Maathuis <madman2003@gmail.com>
>Date: Tue, 1 Dec 2009 20:12:07 +0100
>Subject: [PATCH 3/4] exa/mixed: devKind doesn't have to be set before calling ExaCopyDirty*
>
>Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
>---
> exa/exa_migration_mixed.c |    6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
>diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
>index a7fdf63..36afc86 100644
>--- a/exa/exa_migration_mixed.c
>+++ b/exa/exa_migration_mixed.c
>@@ -101,7 +101,6 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
> 	if (pExaPixmap->pDamage && exaPixmapHasGpuCopy(pPixmap)) {
> 	    ExaScreenPriv(pPixmap->drawable.pScreen);
> 
>-	    pPixmap->devKind = pExaPixmap->fb_pitch;
> 	    exaCopyDirtyToFb(pixmaps + i);
> 
> 	    if (pExaScr->deferred_mixed_pixmap == pPixmap)
>@@ -183,17 +182,14 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
> 		    pixmaps[0].as_src = TRUE;
> 		    pixmaps[0].pReg = NULL;
> 		}
>-		pPixmap->devKind = pExaPixmap->fb_pitch;
> 		exaCopyDirtyToSys(pixmaps);
> 	    }
> 
> 	    if (as_dst)
> 		exaPixmapDirty(pPixmap, 0, 0, pPixmap->drawable.width,
> 			       pPixmap->drawable.height);
>-	} else if (has_gpu_copy) {
>-	    pPixmap->devKind = pExaPixmap->fb_pitch;
>+	} else if (has_gpu_copy)
> 	    exaCopyDirtyToSys(pixmaps);
>-	}
> 
> 	pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
> 	pPixmap->devKind = pExaPixmap->sys_pitch;
>-- 
>1.6.5.3
>

Actions: View | Splinter Review

Attachments on bug 25343: 31553 | 31634 | 31635

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.