summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2021-01-28 17:11:44 +0100
committerOlivier Fourdan <fourdan@gmail.com>2021-01-29 13:51:06 +0000
commit5429791b1cf7f6cabf6c64aad0a4b1b5418253c9 (patch)
tree2ea2f869375767914283995ab9a6369b3383b4ff
parent3cdac5ba07a79761652d960e0e907601f82718bc (diff)
Revert "mi: Shortcut miDoCopy/miCopyArea based on clipList"
This reverts commit f665a9c9e6c8643f3050378249db3088ae3057be. Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Acked-by: Martin Peres <martin.peres@mupuf.org> Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1108 Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1128
-rw-r--r--mi/mibitblt.c4
-rw-r--r--mi/micopy.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 0954b2545..0b13e49e4 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -96,9 +96,9 @@ miCopyArea(DrawablePtr pSrcDrawable,
srcx = xIn + pSrcDrawable->x;
srcy = yIn + pSrcDrawable->y;
- /* If the destination is clipped away, this is easy */
+ /* If the destination isn't realized, this is easy */
if (pDstDrawable->type == DRAWABLE_WINDOW &&
- RegionNil(pGC->pCompositeClip))
+ !((WindowPtr) pDstDrawable)->realized)
return NULL;
/* clip the source */
diff --git a/mi/micopy.c b/mi/micopy.c
index dd40ec0e3..40096f24c 100644
--- a/mi/micopy.c
+++ b/mi/micopy.c
@@ -152,9 +152,10 @@ miDoCopy(DrawablePtr pSrcDrawable,
Bool fastDst = FALSE; /* for fast clipping with one rect dest */
Bool fastExpose = FALSE; /* for fast exposures with pixmap source */
- /* Short cut for unmapped or fully clipped windows */
+ /* Short cut for unmapped windows */
+
if (pDstDrawable->type == DRAWABLE_WINDOW &&
- RegionNil(pGC->pCompositeClip)) {
+ !((WindowPtr) pDstDrawable)->realized) {
return NULL;
}