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

Revert "Use IncludeInferiors when copying windows before compositing." 

This reverts commit 7c7f0c2c6a.

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
This commit is contained in:
Keith Packard 2009-12-01 11:05:04 -08:00
parent 8e640d6b13
commit 071b3c1810
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fb/fbpict.c
View File

@ -159,9 +159,9 @@ fbComposite (CARD8 op,
{ {
pixman_image_t *src, *mask, *dest; pixman_image_t *src, *mask, *dest;
miCompositeSourceValidate (pSrc, xSrc, ySrc, width, height); miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
if (pMask) if (pMask)
miCompositeSourceValidate (pMask, xMask, yMask, width, height); miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
src = image_from_pict (pSrc, TRUE, TRUE); src = image_from_pict (pSrc, TRUE, TRUE);
mask = image_from_pict (pMask, TRUE, TRUE); mask = image_from_pict (pMask, TRUE, TRUE);
@ -295,8 +295,7 @@ copy_drawable (DrawablePtr pDraw)
/* First fill the pixmap with zeros */ /* First fill the pixmap with zeros */
gcv[0].val = 0x00000000; gcv[0].val = 0x00000000;
gcv[1].val = IncludeInferiors; dixChangeGC (NullClient, pGC, GCBackground, NULL, gcv);
dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv);
ValidateGC ((DrawablePtr)pPixmap, pGC); ValidateGC ((DrawablePtr)pPixmap, pGC);
miClearDrawable ((DrawablePtr)pPixmap, pGC); miClearDrawable ((DrawablePtr)pPixmap, pGC);