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

Revert "render: use dixDestroyPixmap() instead of direct driver call" 

This reverts commit c8607ca66f.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
This commit is contained in:
Alan Coopersmith 2025-06-11 17:44:28 -07:00 committed by Marge Bot
parent 9550b2d105
commit 3802252040
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
render/glyph.c
View File

@ -608,7 +608,7 @@ miGlyphs(CARD8 op,
maskFormat, CPComponentAlpha, &component_alpha,
serverClient, &error);
if (!pMask) {
dixDestroyPixmap(pMaskPixmap, 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
return;
}
pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
@ -676,7 +676,7 @@ miGlyphs(CARD8 op,
xSrc + x - xDst,
ySrc + y - yDst, 0, 0, x, y, width, height);
FreePicture((void *) pMask, (XID) 0);
dixDestroyPixmap(pMaskPixmap, 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
}
}

2
render/mipict.c
View File

@ -67,7 +67,7 @@ miChangePictureClip(PicturePtr pPicture, int type, void *value, int n)
clientClip = BitmapToRegion(pScreen, (PixmapPtr) value);
if (!clientClip)
return BadAlloc;
dixDestroyPixmap((PixmapPtr) value, 0);
(*pScreen->DestroyPixmap) ((PixmapPtr) value);
break;
case CT_REGION:
clientClip = value;

2
render/picture.c
View File

@ -1416,7 +1416,7 @@ FreePicture(void *value, XID pid)
}
}
else if (pPicture->pDrawable->type == DRAWABLE_PIXMAP) {
dixDestroyPixmap((PixmapPtr) pPicture->pDrawable, 0);
(*pScreen->DestroyPixmap) ((PixmapPtr) pPicture->pDrawable);
}
}
dixFreeObjectWithPrivates(pPicture, PRIVATE_PICTURE);

4
render/render.c
View File

@ -1137,7 +1137,7 @@ ProcRenderAddGlyphs(ClientPtr client)
/* The picture takes a reference to the pixmap, so we
drop ours. */
dixDestroyPixmap(pDstPix, 0);
(pScreen->DestroyPixmap) (pDstPix);
pDstPix = NULL;
if (!pDst) {
@ -1542,7 +1542,7 @@ ProcRenderCreateCursor(ClientPtr client)
free(mskbits);
return error;
}
dixDestroyPixmap(pPixmap, 0);
(*pScreen->DestroyPixmap) (pPixmap);
CompositePicture(PictOpSrc,
pSrc, 0, pPicture, 0, 0, 0, 0, 0, 0, width, height);
(*pScreen->GetImage) (pPicture->pDrawable,