diff options
| author | Eric Anholt <eric@anholt.net> | 2010-10-28 20:46:22 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-10 15:51:03 -0800 |
| commit | f36153e3ef6b13a87d016caab09cc9be274b0dd5 (patch) | |
| tree | 356d1dc9e409c24abb220b927f9d6f6b409ba144 /composite | |
| parent | c80c41767eb101e9dbd8393d8cca7764b4e248a4 (diff) | |
Replace usage of DamageRegionAppend with DamageDamageRegion to fix reportAfter.
In all these cases, any rendering implied by this damage has already
occurred, and we want to get the damage out to the client. Some of
the DamageRegionAppend calls were explicitly telling damage to flush
the reportAfter damage out, but not all.
Bug #30260. Fixes the compiz wallpaper plugin with client damage
changed to reportAfter.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'composite')
| -rw-r--r-- | composite/compalloc.c | 2 | ||||
| -rw-r--r-- | composite/compwindow.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c index 47d5c0a3c..c86eb9b69 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -238,7 +238,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; pWin->redirectDraw = RedirectDrawAutomatic; - DamageRegionAppend(&pWin->drawable, &pWin->borderSize); + DamageDamageRegion(&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) { diff --git a/composite/compwindow.c b/composite/compwindow.c index 8849dc317..d17ff771f 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -519,7 +519,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) RegionTranslate(prgnSrc, pWin->drawable.x - ptOldOrg.x, pWin->drawable.y - ptOldOrg.y); - DamageRegionAppend(&pWin->drawable, prgnSrc); + DamageDamageRegion(&pWin->drawable, prgnSrc); } cs->CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = compCopyWindow; @@ -598,7 +598,7 @@ compSetRedirectBorderClip (WindowPtr pWin, RegionPtr pRegion) /* * Report that as damaged so it will be redrawn */ - DamageRegionAppend(&pWin->drawable, &damage); + DamageDamageRegion(&pWin->drawable, &damage); RegionUninit(&damage); /* * Save the new border clip region |