frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mi: Shortcut miDoCopy/miCopyArea based on clipList" 

This reverts commit f665a9c9e6.

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
This commit is contained in:
Olivier Fourdan 2021-01-28 17:11:44 +01:00 committed by Olivier Fourdan
parent 3cdac5ba07
commit 5429791b1c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mi/mibitblt.c
View File

@ -96,9 +96,9 @@ miCopyArea(DrawablePtr pSrcDrawable,
srcx = xIn + pSrcDrawable->x; srcx = xIn + pSrcDrawable->x;
srcy = yIn + pSrcDrawable->y; 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 && if (pDstDrawable->type == DRAWABLE_WINDOW &&
RegionNil(pGC->pCompositeClip)) !((WindowPtr) pDstDrawable)->realized)
return NULL; return NULL;
/* clip the source */ /* clip the source */

5
mi/micopy.c
View File

@ -152,9 +152,10 @@ miDoCopy(DrawablePtr pSrcDrawable,
Bool fastDst = FALSE; /* for fast clipping with one rect dest */ Bool fastDst = FALSE; /* for fast clipping with one rect dest */
Bool fastExpose = FALSE; /* for fast exposures with pixmap source */ 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 && if (pDstDrawable->type == DRAWABLE_WINDOW &&
RegionNil(pGC->pCompositeClip)) { !((WindowPtr) pDstDrawable)->realized) {
return NULL; return NULL;
} }