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

EXA: ModifyPixmapHeader_mixed fixes. 

* Better detection of dimension changes.
* Make sure to re-create the system memory copy when the pixmap dimensions
  change (e.g. the screen pixmap on screen resize).
* Clear the valid regions.

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2009-12-08 20:25:02 +01:00 committed by Keith Packard
parent c1503861cf
commit 955b9f23a3
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
exa/exa_mixed.c
View File

@ -135,17 +135,54 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED; pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
} }
has_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
if (width <= 0)
width = pPixmap->drawable.width;
if (height <= 0)
height = pPixmap->drawable.height;
if (bitsPerPixel <= 0) {
if (depth <= 0)
bitsPerPixel = pPixmap->drawable.bitsPerPixel;
else
bitsPerPixel = BitsPerPixel(depth);
}
if (depth <= 0)
depth = pPixmap->drawable.depth;
if (width != pPixmap->drawable.width ||
height != pPixmap->drawable.height ||
devKind != pPixmap->devKind ||
depth != pPixmap->drawable.depth ||
bitsPerPixel != pPixmap->drawable.bitsPerPixel) {
if (pExaPixmap->driverPriv) { if (pExaPixmap->driverPriv) {
if (width > 0 && height > 0 && bitsPerPixel > 0) {
exaSetFbPitch(pExaScr, pExaPixmap, exaSetFbPitch(pExaScr, pExaPixmap,
width, height, bitsPerPixel); width, height, bitsPerPixel);
exaSetAccelBlock(pExaScr, pExaPixmap, exaSetAccelBlock(pExaScr, pExaPixmap,
width, height, bitsPerPixel); width, height, bitsPerPixel);
REGION_EMPTY(pScreen, &pExaPixmap->validFB);
}
/* Need to re-create system copy if there's also a GPU copy */
if (has_gpu_copy && pExaPixmap->sys_ptr) {
free(pExaPixmap->sys_ptr);
pExaPixmap->sys_ptr = NULL;
pExaPixmap->sys_pitch = devKind > 0 ? devKind :
PixmapBytePad(width, depth);
DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL;
REGION_EMPTY(pScreen, &pExaPixmap->validSys);
if (pExaScr->deferred_mixed_pixmap == pPixmap)
pExaScr->deferred_mixed_pixmap = NULL;
} }
} }
has_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
if (has_gpu_copy) { if (has_gpu_copy) {
pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr; pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr;
pPixmap->devKind = pExaPixmap->fb_pitch; pPixmap->devKind = pExaPixmap->fb_pitch;