From 0998574699502e6ab14fd8899c2e42961d4df7d0 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Wed, 5 Jan 2011 20:41:05 +0200 Subject: Call SourceValidate even if src == dst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The extra SourceValidate calls from damageCopyArea and damageCopyPlane can be removed. Signed-off-by: Ville Syrjälä Reviewed-by: Keith Packard Reviewed-by: Daniel Stone Signed-off-by: Keith Packard --- miext/damage/damage.c | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'miext') 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; -- cgit v1.2.3