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

EXA: Simplify exaFillRegionTiled() control flow. 

Also only call REGION_TRANSLATE() when necessary.
This commit is contained in:
Michel Dänzer 2008-07-31 10:55:44 +02:00
parent b37b1e6699
commit 8405c25d9d
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exa/exa_accel.c
View File

@ -1234,14 +1234,11 @@ exaFillRegionTiled (DrawablePtr pDrawable,
pixmaps[1].pPix = pTile; pixmaps[1].pPix = pTile;
pixmaps[1].pReg = NULL; pixmaps[1].pReg = NULL;
exaGetDrawableDeltas(pDrawable, pPixmap, &xoff, &yoff);
REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
pExaPixmap = ExaGetPixmapPriv (pPixmap); pExaPixmap = ExaGetPixmapPriv (pPixmap);
if (pExaPixmap->accel_blocked || pTileExaPixmap->accel_blocked) if (pExaPixmap->accel_blocked || pTileExaPixmap->accel_blocked)
{ {
goto out; return FALSE;
} else { } else {
exaDoMigration (pixmaps, 2, TRUE); exaDoMigration (pixmaps, 2, TRUE);
} }
@ -1249,10 +1246,13 @@ exaFillRegionTiled (DrawablePtr pDrawable,
pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff); pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff);
if (!pPixmap || !exaPixmapIsOffscreen(pTile)) if (!pPixmap || !exaPixmapIsOffscreen(pTile))
goto out; return FALSE;
if ((*pExaScr->info->PrepareCopy) (pTile, pPixmap, 1, 1, alu, planemask)) if ((*pExaScr->info->PrepareCopy) (pTile, pPixmap, 1, 1, alu, planemask))
{ {
if (xoff || yoff)
REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
for (i = 0; i < nbox; i++) for (i = 0; i < nbox; i++)
{ {
int height = pBox[i].y2 - pBox[i].y1; int height = pBox[i].y2 - pBox[i].y1;
@ -1297,8 +1297,6 @@ exaFillRegionTiled (DrawablePtr pDrawable,
} }
(*pExaScr->info->DoneCopy) (pPixmap); (*pExaScr->info->DoneCopy) (pPixmap);
exaMarkSync(pDrawable->pScreen);
/* With GXcopy, we only need to do the basic algorithm up to the tile /* With GXcopy, we only need to do the basic algorithm up to the tile
* size; then, we can just keep doubling the destination in each * size; then, we can just keep doubling the destination in each
* direction until it fills the box. This way, the number of copy * direction until it fills the box. This way, the number of copy
@ -1336,15 +1334,15 @@ exaFillRegionTiled (DrawablePtr pDrawable,
} }
(*pExaScr->info->DoneCopy) (pPixmap); (*pExaScr->info->DoneCopy) (pPixmap);
ret = TRUE;
}
} }
out: exaMarkSync(pDrawable->pScreen);
if (xoff || yoff)
REGION_TRANSLATE(pScreen, pRegion, -xoff, -yoff); REGION_TRANSLATE(pScreen, pRegion, -xoff, -yoff);
}
return ret; return TRUE;
} }