From 6142282bfe88551b00f91961eacc0a958b6ff9f8 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 "glamor: use dixDestroyPixmap() instead of direct
 driver call"

This reverts commit 7a0f8301c5b7de92b374707b53fdd474345c1693.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020>
---
 glamor/glamor_composite_glyphs.c | 5 +++--
 glamor/glamor_egl.c              | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index c1a0cb0f0..428303091 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -436,7 +436,7 @@ glamor_composite_glyphs(CARD8 op,
                                 glyphs_queued = 0;
                             }
                             if (glyph_atlas->atlas) {
-                                dixDestroyPixmap(glyph_atlas->atlas, 0);
+                                (*screen->DestroyPixmap)(glyph_atlas->atlas);
                                 glyph_atlas->atlas = NULL;
                             }
                         }
@@ -571,7 +571,8 @@ glamor_free_glyph_atlas(struct glamor_glyph_atlas *atlas)
 {
     if (!atlas)
         return;
-    dixDestroyPixmap(atlas->atlas, 0);
+    if (atlas->atlas)
+        (*atlas->atlas->drawable.pScreen->DestroyPixmap)(atlas->atlas);
     free (atlas);
 }
 
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index e6992deee..668eddc86 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -346,7 +346,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
         xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                    "Failed to make %dx%dx%dbpp pixmap from GBM bo\n",
                    width, height, pixmap->drawable.bitsPerPixel);
-        dixDestroyPixmap(exported, 0);
+        screen->DestroyPixmap(exported);
         gbm_bo_destroy(bo);
         return FALSE;
     }
@@ -367,7 +367,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
     /* Swap the devKind into the original pixmap, reflecting the bo's stride */
     screen->ModifyPixmapHeader(pixmap, 0, 0, 0, 0, exported->devKind, NULL);
 
-    dixDestroyPixmap(exported, 0);
+    screen->DestroyPixmap(exported);
 
     return TRUE;
 }
@@ -632,7 +632,7 @@ glamor_pixmap_from_fds(ScreenPtr screen,
 
 error:
     if (ret == FALSE) {
-        dixDestroyPixmap(pixmap, 0);
+        screen->DestroyPixmap(pixmap);
         return NULL;
     }
     return pixmap;
@@ -654,7 +654,7 @@ glamor_pixmap_from_fd(ScreenPtr screen,
                                      stride, depth, bpp);
 
     if (ret == FALSE) {
-        dixDestroyPixmap(pixmap, 0);
+        screen->DestroyPixmap(pixmap);
         return NULL;
     }
     return pixmap;