summaryrefslogtreecommitdiff
path: root/miext/damage
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2004-08-12 01:57:51 +0000
committerKristian Høgsberg <krh@redhat.com>2004-08-12 01:57:51 +0000
commit47ee5f4ba72f0e0bc92a5e04073c70808e85fc08 (patch)
tree152e4bdae3268e62f063e04d81c41177edbc1411 /miext/damage
parent09d0056b8bc103f67a35980934f03d28fed51164 (diff)
Add call to SourceValidate() when pDst == pSrc, so misprite.c get a chance
to remove the sprite before the area is copied. The drivers handle pDst != pSrc (#1030).
Diffstat (limited to 'miext/damage')
-rwxr-xr-xmiext/damage/damage.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 3d1681dc9..98f42e54c 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -728,6 +728,12 @@ 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->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height);
+
if (checkGCDamage (pDst, pGC))
{
BoxRec box;
@@ -762,6 +768,13 @@ 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->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height);
+
if (checkGCDamage (pDst, pGC))
{
BoxRec box;