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

Revert "exa: the extent of the valid region is probably much larger than that of the pending damage." 

This reverts commit 97c1cbc702.

- Sorry for the thinko, pending damage is often not fragmentated.
- Should the dst region become fragmentated, you actually want to copy more to unfragmentate it.
This commit is contained in:
Maarten Maathuis 2009-02-17 19:40:59 +01:00
parent 3175646b10
commit b2ceea3635
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
exa/exa_migration.c
View File

@ -174,13 +174,23 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc,
#endif #endif
/* Try to prevent destination valid region from growing too many /* Try to prevent destination valid region from growing too many
* rects by filling it up to the extents of the pending damage region. * rects by filling it up to the extents of the union of the
* destination valid region and the pending damage region.
*/ */
if (REGION_NUM_RECTS(pValidDst) > 10) { if (REGION_NUM_RECTS(pValidDst) > 10) {
BoxPtr pDamageExt = REGION_EXTENTS(pScreen, pending_damage); BoxRec box;
BoxPtr pValidExt, pDamageExt;
RegionRec closure; RegionRec closure;
REGION_INIT(pScreen, &closure, pDamageExt, 0); pValidExt = REGION_EXTENTS(pScreen, pValidDst);
pDamageExt = REGION_EXTENTS(pScreen, pending_damage);
box.x1 = min(pValidExt->x1, pDamageExt->x1);
box.y1 = min(pValidExt->y1, pDamageExt->y1);
box.x2 = max(pValidExt->x2, pDamageExt->x2);
box.y2 = max(pValidExt->y2, pDamageExt->y2);
REGION_INIT(pScreen, &closure, &box, 0);
REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, &closure); REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, &closure);
} else } else
REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, pending_damage); REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, pending_damage);