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

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

This reverts commit 4694b8488e.

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 a5a89e9fa2
commit b91182cc16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dri3/dri3_request.c
View File

@ -244,7 +244,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client)
pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess); pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
if (rc != Success) { if (rc != Success) {
dixDestroyPixmap(pixmap, 0); (*drawable->pScreen->DestroyPixmap) (pixmap);
return rc; return rc;
} }
if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap)) if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap))
@ -508,7 +508,7 @@ proc_dri3_pixmap_from_buffers(ClientPtr client)
pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess); pixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess);
if (rc != Success) { if (rc != Success) {
dixDestroyPixmap(pixmap, 0); (*screen->DestroyPixmap) (pixmap);
return rc; return rc;
} }
if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap)) if (!AddResource(stuff->pixmap, X11_RESTYPE_PIXMAP, (void *) pixmap))