From 78cd96899e24921eddf33a423e3fe959df590661 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 30 Sep 2024 17:56:38 +0200 Subject: [PATCH] (!1711) randr: use dixDestroyPixmap() instead of direct driver call Direct calls to ScreenRec->DestroyPixmap() blocks cleaning up the wrapping jungle, so use the proper dix function instead. See: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1754 Signed-off-by: Enrico Weigelt, metux IT consult --- randr/rrcrtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index b47f0aeac..79003223b 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -382,11 +382,11 @@ rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) { */ PixmapUnshareSecondaryPixmap(pPixmap); - primary->DestroyPixmap(pPixmap->primary_pixmap); - primary->DestroyPixmap(pPixmap->primary_pixmap); + dixDestroyPixmap(pPixmap->primary_pixmap, 0); + dixDestroyPixmap(pPixmap->primary_pixmap, 0); } - crtc->pScreen->DestroyPixmap(pPixmap); + dixDestroyPixmap(pPixmap, 0); } void @@ -440,7 +440,7 @@ rrCreateSharedPixmap(RRCrtcPtr crtc, ScreenPtr primary, spix = PixmapShareToSecondary(mpix, crtc->pScreen); if (spix == NULL) { - primary->DestroyPixmap(mpix); + dixDestroyPixmap(mpix, 0); return NULL; }