summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drmmode_display.c8
-rw-r--r--src/radeon_dri2.c8
-rw-r--r--src/radeon_exa_render.c10
-rw-r--r--src/radeon_exa_shared.c2
-rw-r--r--src/radeon_glamor.c7
-rw-r--r--src/radeon_kms.c2
6 files changed, 19 insertions, 18 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index af598999..a58f24dd 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -141,13 +141,15 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
return pixmap;
fail:
- dixDestroyPixmap(pixmap, 0);
+ pScreen->DestroyPixmap(pixmap);
return NULL;
}
static void drmmode_destroy_bo_pixmap(PixmapPtr pixmap)
{
- dixDestroyPixmap(pixmap, 0);
+ ScreenPtr pScreen = pixmap->drawable.pScreen;
+
+ (*pScreen->DestroyPixmap)(pixmap);
}
static void
@@ -440,7 +442,7 @@ destroy_pixmap_for_fbcon(ScrnInfoPtr pScrn)
return;
if (info->fbcon_pixmap)
- dixDestroyPixmap(info->fbcon_pixmap, 0);
+ pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
info->fbcon_pixmap = NULL;
}
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 114cf22e..fba56e5d 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -273,7 +273,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
error:
free(buffers);
- dixDestroyPixmap(pixmap, 0);
+ (*pScreen->DestroyPixmap)(pixmap);
return NULL;
}
@@ -299,7 +299,7 @@ radeon_dri2_destroy_buffer2(ScreenPtr pScreen,
if (private->refcnt == 0)
{
if (private->pixmap)
- dixDestroyPixmap(private->pixmap, 0);
+ (*pScreen->DestroyPixmap)(private->pixmap);
free(buffers->driverPrivate);
free(buffers);
@@ -649,10 +649,10 @@ update_front(DrawablePtr draw, DRI2BufferPtr front)
if (!info->use_glamor)
exaMoveInPixmap(pixmap);
if (!radeon_get_flink_name(pRADEONEnt, pixmap, &front->name)) {
- dixDestroyPixmap(pixmap, 0);
+ (*draw->pScreen->DestroyPixmap)(pixmap);
return FALSE;
}
- dixDestroyPixmap(priv->pixmap, 0);
+ (*draw->pScreen->DestroyPixmap)(priv->pixmap);
front->pitch = pixmap->devKind;
front->cpp = pixmap->drawable.bitsPerPixel / 8;
priv->pixmap = pixmap;
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 288e9dd1..a5f9612b 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -615,7 +615,7 @@ static Bool R100PrepareComposite(int op,
pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
if (!pMask) {
if (!pSrcPicture->pDrawable)
- dixDestroyPixmap(pSrc, 0);
+ pScreen->DestroyPixmap(pSrc);
RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
}
}
@@ -977,7 +977,7 @@ static Bool R200PrepareComposite(int op, PicturePtr pSrcPicture,
pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
if (!pMask) {
if (!pSrcPicture->pDrawable)
- dixDestroyPixmap(pSrc, 0);
+ pScreen->DestroyPixmap(pSrc);
RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
}
}
@@ -1469,7 +1469,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
if (!pMask) {
if (!pSrcPicture->pDrawable)
- dixDestroyPixmap(pSrc, 0);
+ pScreen->DestroyPixmap(pSrc);
RADEON_FALLBACK(("Failed to create solid scratch pixmap\n"));
}
}
@@ -2148,10 +2148,10 @@ static void RadeonDoneComposite(PixmapPtr pDst)
RadeonFinishComposite(pDst);
if (!accel_state->src_pic->pDrawable)
- dixDestroyPixmap(accel_state->src_pix, 0);
+ pScreen->DestroyPixmap(accel_state->src_pix);
if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
- dixDestroyPixmap(accel_state->msk_pix, 0);
+ pScreen->DestroyPixmap(accel_state->msk_pix);
}
#define VTX_OUT_MASK(_dstX, _dstY, _srcX, _srcY, _maskX, _maskY) \
diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
index 1378876b..94238a5a 100644
--- a/src/radeon_exa_shared.c
+++ b/src/radeon_exa_shared.c
@@ -132,7 +132,7 @@ PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
bo = radeon_get_pixmap_bo(pPix)->bo.radeon;
if (radeon_bo_map(bo, 1)) {
- dixDestroyPixmap(pPix, 0);
+ pScreen->DestroyPixmap(pPix);
return NULL;
}
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index 8ca413f7..ccf99941 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -199,7 +199,7 @@ static Bool radeon_glamor_destroy_pixmap(PixmapPtr pixmap)
#ifndef HAVE_GLAMOR_EGL_DESTROY_TEXTURED_PIXMAP
ScreenPtr screen = pixmap->drawable.pScreen;
RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(screen));
- Bool ret = TRUE;
+ Bool ret;
#endif
if (pixmap->refcnt == 1) {
@@ -214,8 +214,7 @@ static Bool radeon_glamor_destroy_pixmap(PixmapPtr pixmap)
return TRUE;
#else
screen->DestroyPixmap = info->glamor.SavedDestroyPixmap;
- if (screen->DestroyPixmap(pixmap))
- ret = screen->DestroyPixmap(pixmap);
+ ret = screen->DestroyPixmap(pixmap);
info->glamor.SavedDestroyPixmap = screen->DestroyPixmap;
screen->DestroyPixmap = radeon_glamor_destroy_pixmap;
@@ -360,7 +359,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
0, 0, pixmap->devKind, NULL);
old->devPrivate.ptr = NULL;
- dixDestroyPixmap(pixmap, 0);
+ screen->DestroyPixmap(pixmap);
return old;
}
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 8b4d2dd8..51b00dd9 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -209,7 +209,7 @@ static void RADEONFreeRec(ScrnInfoPtr pScrn)
info = RADEONPTR(pScrn);
if (info) {
if (info->fbcon_pixmap)
- dixDestroyPixmap(info->fbcon_pixmap, 0);
+ pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
if (info->accel_state) {
free(info->accel_state);
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-04 08:42:52 +0000