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

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

This reverts commit 9ca03e6da0.

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 5ead727d52
commit a5a89e9fa2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
exa/exa_glyphs.c
View File

@ -194,7 +194,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
CPComponentAlpha, &component_alpha, serverClient, CPComponentAlpha, &component_alpha, serverClient,
&error); &error);
dixDestroyPixmap(pPixmap, 0); /* picture holds a refcount */ (*pScreen->DestroyPixmap) (pPixmap); /* picture holds a refcount */
if (!pPicture) if (!pPicture)
return FALSE; return FALSE;
@ -728,7 +728,7 @@ exaGlyphs(CARD8 op,
{ {
PictFormatPtr argbFormat; PictFormatPtr argbFormat;
dixDestroyPixmap(pMaskPixmap, 0); (*pScreen->DestroyPixmap) (pMaskPixmap);
if (!pMask) if (!pMask)
return; return;
@ -751,7 +751,7 @@ exaGlyphs(CARD8 op,
pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
serverClient, &error); serverClient, &error);
if (!pMask) { if (!pMask) {
dixDestroyPixmap(pMaskPixmap, 0); (*pScreen->DestroyPixmap) (pMaskPixmap);
return; return;
} }
} }
@ -832,6 +832,6 @@ exaGlyphs(CARD8 op,
xSrc + x - first_xOff, xSrc + x - first_xOff,
ySrc + y - first_yOff, 0, 0, x, y, width, height); ySrc + y - first_yOff, 0, 0, x, y, width, height);
FreePicture((void *) pMask, (XID) 0); FreePicture((void *) pMask, (XID) 0);
dixDestroyPixmap(pMaskPixmap, 0); (*pScreen->DestroyPixmap) (pMaskPixmap);
} }
} }

2
exa/exa_offscreen.c
View File

@ -614,7 +614,7 @@ ExaOffscreenDefragment(ScreenPtr pScreen)
pDstPix->drawable.depth = 0; pDstPix->drawable.depth = 0;
pDstPix->drawable.bitsPerPixel = 0; pDstPix->drawable.bitsPerPixel = 0;
dixDestroyPixmap(pDstPix, 0); (*pScreen->DestroyPixmap) (pDstPix);
if (area->state == ExaOffscreenAvail && area->size > largest_size) if (area->state == ExaOffscreenAvail && area->size > largest_size)
return area; return area;

4
exa/exa_render.c
View File

@ -1082,7 +1082,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen,
return 0; return 0;
pGC = GetScratchGC(pPixmap->drawable.depth, pScreen); pGC = GetScratchGC(pPixmap->drawable.depth, pScreen);
if (!pGC) { if (!pGC) {
dixDestroyPixmap(pPixmap, 0); (*pScreen->DestroyPixmap) (pPixmap);
return 0; return 0;
} }
ValidateGC(&pPixmap->drawable, pGC); ValidateGC(&pPixmap->drawable, pGC);
@ -1095,7 +1095,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen,
FreeScratchGC(pGC); FreeScratchGC(pGC);
pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat, pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat,
0, 0, serverClient, &error); 0, 0, serverClient, &error);
dixDestroyPixmap(pPixmap, 0); (*pScreen->DestroyPixmap) (pPixmap);
return pPicture; return pPicture;
} }