summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-10-28 20:46:22 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-11-13 15:17:58 -0800
commitdfda3c696dd72ecc5cc4fa69d8bb4521ba554cf3 (patch)
tree55e58f0741d4d2da7e5b24af130fc19497e9e786 /glx
parent2e08f1d4b7c0c43c90042a71825992f40388c1fb (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> (cherry picked from commit f36153e3ef6b13a87d016caab09cc9be274b0dd5)
Diffstat (limited to 'glx')
-rw-r--r--glx/glxdri.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 41482c913..6458ef928 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -834,9 +834,7 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
RegionInit(&region, (BoxPtr) rects, num_rects);
RegionTranslate(&region, pDraw->x, pDraw->y);
- DamageRegionAppend(pDraw, &region);
- /* This is wrong, this needs a seperate function. */
- DamageRegionProcessPending(pDraw);
+ DamageDamageRegion(pDraw, &region);
RegionUninit(&region);
__glXleaveServer(GL_FALSE);