From 647b79f87a9891225678dc6fc2fbda3bdef8fa9d Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Wed, 18 Nov 2009 21:23:08 +0100 Subject: [PATCH] exa/mixed: avoid copying back pixmap data when no migration took place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - When the driver handles the prepare access no copying is needed. - Delayed pixmap creation should be fine, because it's handled by the first prepare access, but the exaPixmapIsOffscreen check in finish access will return FALSE without a driver pixmap. Signed-off-by: Maarten Maathuis Acked-by: Michel Dänzer --- exa/exa_migration_mixed.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c index 6065d7577..ea6f878a2 100644 --- a/exa/exa_migration_mixed.c +++ b/exa/exa_migration_mixed.c @@ -210,7 +210,8 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index) { ExaPixmapPriv(pPixmap); - if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) { + if (pExaPixmap->pDamage && !pExaPixmap->offscreen && + exaPixmapIsOffscreen(pPixmap)){ DamageRegionProcessPending(&pPixmap->drawable); if (index == EXA_PREPARE_DEST || index == EXA_PREPARE_AUX_DEST) {