xf86-video-r128: Branch 'revert-bc21fcdf'

[GitLab Mirror]

Rebased ref, commits from common ancestor:
commit 657d53117f1a59dc469a52df92132140668b9d58
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jun 14 09:50:48 2025 -0700

    Revert "use dixDestroyPixmap() instead of direct driver call"
    
    This reverts commit bc21fcdffa623bb8e7150e1da69aeaed6cd7c5d2
    
    Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128/-/merge_requests/18>

diff --git a/src/r128_exa.c b/src/r128_exa.c
index e0d474d..cf9b74f 100644
--- a/src/r128_exa.c
+++ b/src/r128_exa.c
@@ -324,11 +324,11 @@ R128Done(PixmapPtr pPixmap)
     info->state_2d.in_use = FALSE;
 #if defined(R128DRI) && defined(RENDER)
     if (info->state_2d.src_pix) {
-        dixDestroyPixmap(info->state_2d.src_pix, 0);
+        pScreen->DestroyPixmap(info->state_2d.src_pix);
 	info->state_2d.src_pix = NULL;
     }
     if (info->state_2d.msk_pix) {
-        dixDestroyPixmap(info->state_2d.msk_pix, 0);
+        pScreen->DestroyPixmap(info->state_2d.msk_pix);
 	info->state_2d.msk_pix = NULL;
     }
 #endif
diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c
index 3e3ba2a..0d81a09 100644
--- a/src/r128_exa_render.c
+++ b/src/r128_exa_render.c
@@ -108,7 +108,7 @@ R128SolidPixmap(ScreenPtr pScreen, uint32_t solid)
 
     exaMoveInPixmap(pPix);
     if (!exaDrawableIsOffscreen(&pPix->drawable)) {
-        dixDestroyPixmap(pPix, 0);
+        pScreen->DestroyPixmap(pPix);
 	return NULL;
     }
     info->ExaDriver->WaitMarker(pScreen, 0);
@@ -459,7 +459,7 @@ R128CCEPrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
 	    pMask = R128SolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
 	    if (!pMask) {
 	        if (!pSrcPicture->pDrawable)
-                    dixDestroyPixmap(pSrc, 0);
+		    pScreen->DestroyPixmap(pSrc);
 		info->state_2d.has_mask = FALSE;
             DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                                 "Failed to create "