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

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

This reverts commit d2a93d0346.

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 3802252040
commit 918a343710
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
randr/rrcrtc.c
View File

@ -382,11 +382,11 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) {
*/ */
PixmapUnshareSecondaryPixmap(pPixmap); PixmapUnshareSecondaryPixmap(pPixmap);
dixDestroyPixmap(pPixmap->primary_pixmap, 0); primary->DestroyPixmap(pPixmap->primary_pixmap);
dixDestroyPixmap(pPixmap->primary_pixmap, 0); primary->DestroyPixmap(pPixmap->primary_pixmap);
} }
dixDestroyPixmap(pPixmap, 0); crtc->pScreen->DestroyPixmap(pPixmap);
} }
void void
@ -440,7 +440,7 @@ rrCreateSharedPixmap(RRCrtcPtr crtc, ScreenPtr primary,
spix = PixmapShareToSecondary(mpix, crtc->pScreen); spix = PixmapShareToSecondary(mpix, crtc->pScreen);
if (spix == NULL) { if (spix == NULL) {
dixDestroyPixmap(mpix, 0); primary->DestroyPixmap(mpix);
return NULL; return NULL;
} }