DestroyPixmap handles that just fine. This also lets us drop our use
of the manual image destruction function (Note that the ATI driver
still uses it in a similar fashion, though).
Signed-off-by: Eric Anholt <e...@anholt.net>
---
hw/xfree86/drivers/modesetting/drmmode_display.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c
b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 4421578..0d34ca1 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -780,7 +780,6 @@ drmmode_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr
rotate_pixmap, void *data)
drmmode_ptr drmmode = drmmode_crtc->drmmode;
if (rotate_pixmap) {
- drmmode_set_pixmap_bo(drmmode, rotate_pixmap, NULL);
rotate_pixmap->drawable.pScreen->DestroyPixmap(rotate_pixmap);
}
@@ -1588,11 +1587,6 @@ drmmode_set_pixmap_bo(drmmode_ptr drmmode, PixmapPtr
pixmap, drmmode_bo *bo)
if (!drmmode->glamor)
return TRUE;
- if (bo == NULL) {
- glamor_egl_destroy_textured_pixmap(pixmap);
- return TRUE;
- }
-
#ifdef GLAMOR_HAS_GBM
if (!glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap, bo->gbm)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Failed");
--
2.6.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
