diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index 371301888..3ea4a540e 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -194,7 +194,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format) CPComponentAlpha, &component_alpha, serverClient, &error); - (*pScreen->DestroyPixmap) (pPixmap); /* picture holds a refcount */ + dixDestroyPixmap(pPixmap, 0); /* picture holds a refcount */ if (!pPicture) return FALSE; @@ -728,7 +728,7 @@ exaGlyphs(CARD8 op, { PictFormatPtr argbFormat; - (*pScreen->DestroyPixmap) (pMaskPixmap); + dixDestroyPixmap(pMaskPixmap, 0); if (!pMask) return; @@ -751,7 +751,7 @@ exaGlyphs(CARD8 op, pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, serverClient, &error); if (!pMask) { - (*pScreen->DestroyPixmap) (pMaskPixmap); + dixDestroyPixmap(pMaskPixmap, 0); return; } } @@ -832,6 +832,6 @@ exaGlyphs(CARD8 op, xSrc + x - first_xOff, ySrc + y - first_yOff, 0, 0, x, y, width, height); FreePicture((void *) pMask, (XID) 0); - (*pScreen->DestroyPixmap) (pMaskPixmap); + dixDestroyPixmap(pMaskPixmap, 0); } } diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index c77e36261..37fb624da 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -614,7 +614,7 @@ ExaOffscreenDefragment(ScreenPtr pScreen) pDstPix->drawable.depth = 0; pDstPix->drawable.bitsPerPixel = 0; - (*pScreen->DestroyPixmap) (pDstPix); + dixDestroyPixmap(pDstPix, 0); if (area->state == ExaOffscreenAvail && area->size > largest_size) return area; diff --git a/exa/exa_render.c b/exa/exa_render.c index da74f64d7..49a4fdbc6 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -1082,7 +1082,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen, return 0; pGC = GetScratchGC(pPixmap->drawable.depth, pScreen); if (!pGC) { - (*pScreen->DestroyPixmap) (pPixmap); + dixDestroyPixmap(pPixmap, 0); return 0; } ValidateGC(&pPixmap->drawable, pGC); @@ -1095,7 +1095,7 @@ exaCreateAlphaPicture(ScreenPtr pScreen, FreeScratchGC(pGC); pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat, 0, 0, serverClient, &error); - (*pScreen->DestroyPixmap) (pPixmap); + dixDestroyPixmap(pPixmap, 0); return pPicture; }