diff options
author | Ville Syrjälä <ville.syrjala@nokia.com> | 2011-01-05 20:41:05 +0200 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-01-05 11:56:42 -0800 |
commit | 0998574699502e6ab14fd8899c2e42961d4df7d0 (patch) | |
tree | 1ac905358ef8f2d7bd19da470de30ae0b9a46186 /miext | |
parent | e41e907b3c19908f5316346fa587ced3115478cd (diff) |
Call SourceValidate even if src == dst
The extra SourceValidate calls from damageCopyArea and damageCopyPlane
can be removed.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'miext')
-rw-r--r-- | miext/damage/damage.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index d0e0fe4d3..566995c41 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -891,17 +891,6 @@ damageCopyArea(DrawablePtr pSrc, RegionPtr ret; DAMAGE_GC_OP_PROLOGUE(pGC, pDst); - /* The driver will only call SourceValidate() when pSrc != pDst, - * but the software sprite (misprite.c) always need to know when a - * drawable is copied so it can remove the sprite. See #1030. */ - if ((pSrc == pDst) && pSrc->pScreen->SourceValidate && - pSrc->type == DRAWABLE_WINDOW && - ((WindowPtr)pSrc)->viewable) - { - (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height, - pGC->subWindowMode); - } - if (checkGCDamage (pDst, pGC)) { BoxRec box; @@ -938,17 +927,6 @@ damageCopyPlane(DrawablePtr pSrc, RegionPtr ret; DAMAGE_GC_OP_PROLOGUE(pGC, pDst); - /* The driver will only call SourceValidate() when pSrc != pDst, - * but the software sprite (misprite.c) always need to know when a - * drawable is copied so it can remove the sprite. See #1030. */ - if ((pSrc == pDst) && pSrc->pScreen->SourceValidate && - pSrc->type == DRAWABLE_WINDOW && - ((WindowPtr)pSrc)->viewable) - { - (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height, - pGC->subWindowMode); - } - if (checkGCDamage (pDst, pGC)) { BoxRec box; |