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

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

This reverts commit eb5476381a.

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 f0d6ec1c8a
commit 2de9ed7604
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composite/compalloc.c
View File

@ -309,7 +309,7 @@ compFreeClientWindow(WindowPtr pWin, XID id)
if (pPixmap) { if (pPixmap) {
compRestoreWindow(pWin, pPixmap); compRestoreWindow(pWin, pPixmap);
dixDestroyPixmap(pPixmap, 0); (*pScreen->DestroyPixmap) (pPixmap);
} }
} }

8
composite/compwindow.c
View File

@ -180,7 +180,7 @@ compCheckRedirect(WindowPtr pWin)
compSetParentPixmap(pWin); compSetParentPixmap(pWin);
compRestoreWindow(pWin, pPixmap); compRestoreWindow(pWin, pPixmap);
dixDestroyPixmap(pPixmap, 0); (*pScreen->DestroyPixmap) (pPixmap);
} }
} }
else if (should) { else if (should) {
@ -378,11 +378,13 @@ compImplicitRedirect(WindowPtr pWin, WindowPtr pParent)
static void static void
compFreeOldPixmap(WindowPtr pWin) compFreeOldPixmap(WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen;
if (pWin->redirectDraw != RedirectDrawNone) { if (pWin->redirectDraw != RedirectDrawNone) {
CompWindowPtr cw = GetCompWindow(pWin); CompWindowPtr cw = GetCompWindow(pWin);
if (cw->pOldPixmap) { if (cw->pOldPixmap) {
dixDestroyPixmap(cw->pOldPixmap, 0); (*pScreen->DestroyPixmap) (cw->pOldPixmap);
cw->pOldPixmap = NullPixmap; cw->pOldPixmap = NullPixmap;
} }
} }
@ -615,7 +617,7 @@ compDestroyWindow(WindowPtr pWin)
PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin); PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
compSetParentPixmap(pWin); compSetParentPixmap(pWin);
dixDestroyPixmap(pPixmap, 0); (*pScreen->DestroyPixmap) (pPixmap);
} }
ret = (*pScreen->DestroyWindow) (pWin); ret = (*pScreen->DestroyWindow) (pWin);
cs->DestroyWindow = pScreen->DestroyWindow; cs->DestroyWindow = pScreen->DestroyWindow;