frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "exa/mixed: be more thorough about setting fb_pitch when needed" 

This reverts commit d4fc245115.

- This is causing crashes/problems for some.

Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Maarten Maathuis 2009-11-23 22:17:43 +01:00 committed by Keith Packard
parent 4677b5a800
commit 55f60e1923
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
exa/exa_migration_mixed.c
View File

@ -98,17 +98,14 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
if (!pExaPixmap->driverPriv) if (!pExaPixmap->driverPriv)
exaCreateDriverPixmap_mixed(pPixmap); exaCreateDriverPixmap_mixed(pPixmap);
if (exaPixmapIsOffscreen(pPixmap)) { if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
ExaScreenPriv(pPixmap->drawable.pScreen);
pPixmap->devKind = pExaPixmap->fb_pitch; pPixmap->devKind = pExaPixmap->fb_pitch;
exaCopyDirtyToFb(pixmaps + i);
if (pExaPixmap->pDamage) { if (pExaScr->deferred_mixed_pixmap == pPixmap)
ExaScreenPriv(pPixmap->drawable.pScreen); pExaScr->deferred_mixed_pixmap = NULL;
exaCopyDirtyToFb(pixmaps + i);
if (pExaScr->deferred_mixed_pixmap == pPixmap)
pExaScr->deferred_mixed_pixmap = NULL;
}
} }
pExaPixmap->offscreen = exaPixmapIsOffscreen(pPixmap); pExaPixmap->offscreen = exaPixmapIsOffscreen(pPixmap);
@ -136,9 +133,8 @@ exaMoveInPixmap_mixed(PixmapPtr pPixmap)
void void
exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg) exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
{ {
ExaPixmapPriv(pPixmap);
if (!ExaDoPrepareAccess(pPixmap, index)) { if (!ExaDoPrepareAccess(pPixmap, index)) {
ExaPixmapPriv(pPixmap);
Bool is_offscreen = exaPixmapIsOffscreen(pPixmap); Bool is_offscreen = exaPixmapIsOffscreen(pPixmap);
ExaMigrationRec pixmaps[1]; ExaMigrationRec pixmaps[1];
@ -201,8 +197,7 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr; pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
pPixmap->devKind = pExaPixmap->sys_pitch; pPixmap->devKind = pExaPixmap->sys_pitch;
pExaPixmap->offscreen = FALSE; pExaPixmap->offscreen = FALSE;
} else }
pPixmap->devKind = pExaPixmap->fb_pitch;
} }
/* Move back results of software rendering on system memory copy of mixed driver /* Move back results of software rendering on system memory copy of mixed driver