modesetting: No need to free the EGLImage just before freeing the pixmap.

DestroyPixmap handles that just fine.  This also lets us drop our use
of the manual image destruction function (Note that the radeon driver
still uses it in a similar fashion, though).

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Eric Anholt 2015-06-19 15:56:13 -07:00
parent 98a1993536
commit 9d2b76652f

View File

@ -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");