[PATCH 2/3] exa/mixed: be more thorough about setting fb_pitch when needed
Maarten Maathuis
madman2003 at gmail.com
Sat Nov 7 04:32:40 PST 2009
Signed-off-by: Maarten Maathuis <madman2003 at gmail.com>
---
exa/exa_migration_mixed.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index 7458e3c..4ea9823 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -98,10 +98,11 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
if (!pExaPixmap->driverPriv)
exaCreateDriverPixmap_mixed(pPixmap);
+ pPixmap->devKind = pExaPixmap->fb_pitch;
+
if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
ExaScreenPriv(pPixmap->drawable.pScreen);
- pPixmap->devKind = pExaPixmap->fb_pitch;
exaCopyDirtyToFb(pixmaps + i);
if (pExaScr->deferred_mixed_pixmap == pPixmap)
@@ -197,6 +198,9 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
pPixmap->devKind = pExaPixmap->sys_pitch;
pExaPixmap->offscreen = FALSE;
+ } else {
+ ExaPixmapPriv(pPixmap);
+ pPixmap->devKind = pExaPixmap->fb_pitch;
}
}
--
1.6.5.1
More information about the xorg-devel
mailing list