updated from 'master'

This commit is contained in:
Dodji Seketeli 2007-10-04 13:07:50 +02:00
commit 4611f9568c

View File

@ -1134,23 +1134,22 @@ exaFillRegionSolid (DrawablePtr pDrawable,
(*pExaScr->info->DoneSolid) (pPixmap); (*pExaScr->info->DoneSolid) (pPixmap);
exaMarkSync(pDrawable->pScreen); exaMarkSync(pDrawable->pScreen);
if (pDrawable->width == 1 && pDrawable->height == 1 && if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) &&
pDrawable->width == 1 && pDrawable->height == 1 &&
pDrawable->bitsPerPixel != 24) { pDrawable->bitsPerPixel != 24) {
ExaPixmapPriv(pPixmap); ExaPixmapPriv(pPixmap);
exaPrepareAccess(pDrawable, EXA_PREPARE_DEST);
switch (pDrawable->bitsPerPixel) { switch (pDrawable->bitsPerPixel) {
case 32: case 32:
*(CARD32*)pPixmap->devPrivate.ptr = pixel; *(CARD32*)pExaPixmap->sys_ptr = pixel;
break; break;
case 16: case 16:
*(CARD16*)pPixmap->devPrivate.ptr = pixel; *(CARD16*)pExaPixmap->sys_ptr = pixel;
break; break;
case 8: case 8:
*(CARD8*)pPixmap->devPrivate.ptr = pixel; *(CARD8*)pExaPixmap->sys_ptr = pixel;
} }
exaFinishAccess(pDrawable, EXA_PREPARE_DEST);
REGION_UNION(pScreen, &pExaPixmap->validSys, &pExaPixmap->validSys, REGION_UNION(pScreen, &pExaPixmap->validSys, &pExaPixmap->validSys,
pRegion); pRegion);
} }