From a5a89e9fa22c0ae21e68de4758025f16a9b202d3 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 11 Jun 2025 17:44:28 -0700
Subject: [PATCH] Revert "exa: use dixDestroyPixmap() instead of direct driver
 call"

This reverts commit 9ca03e6da03b35ad17f50c44f9eebfa229d58643.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
---
 exa/exa_glyphs.c    | 8 ++++----
 exa/exa_offscreen.c | 2 +-
 exa/exa_render.c    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index 3ea4a540e..371301888 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);
 
-    dixDestroyPixmap(pPixmap, 0); /* picture holds a refcount */
+    (*pScreen->DestroyPixmap) (pPixmap);        /* picture holds a refcount */
 
     if (!pPicture)
         return FALSE;
@@ -728,7 +728,7 @@ exaGlyphs(CARD8 op,
         {
             PictFormatPtr argbFormat;
 
-            dixDestroyPixmap(pMaskPixmap, 0);
+            (*pScreen->DestroyPixmap) (pMaskPixmap);
 
             if (!pMask)
                 return;
@@ -751,7 +751,7 @@ exaGlyphs(CARD8 op,
             pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
                                   serverClient, &error);
             if (!pMask) {
-                dixDestroyPixmap(pMaskPixmap, 0);
+                (*pScreen->DestroyPixmap) (pMaskPixmap);
                 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);
-        dixDestroyPixmap(pMaskPixmap, 0);
+        (*pScreen->DestroyPixmap) (pMaskPixmap);
     }
 }
diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 37fb624da..c77e36261 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;
 
-    dixDestroyPixmap(pDstPix, 0);
+    (*pScreen->DestroyPixmap) (pDstPix);
 
     if (area->state == ExaOffscreenAvail && area->size > largest_size)
         return area;
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 49a4fdbc6..da74f64d7 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) {
-        dixDestroyPixmap(pPixmap, 0);
+        (*pScreen->DestroyPixmap) (pPixmap);
         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);
-    dixDestroyPixmap(pPixmap, 0);
+    (*pScreen->DestroyPixmap) (pPixmap);
     return pPicture;
 }