Attachment 115361 Details for Bug 90169 – Don't call radeon_get_pixmap_private() when using EXA

[patch] Don't call radeon_get_pixmap_private() when using EXA

radeon-get_pixmap_private-EXA.diff (text/plain), 1013 bytes, created by Michel Dänzer on 2015-04-27 03:34:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2015-04-27 03:34:13 UTC

Size: 1013 bytes

patch

obsolete

>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index 5af5900..06d1ec0 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -150,7 +150,8 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
> 		}
> 	}
> 
>-	if (!radeon_glamor_create_textured_pixmap(pixmap,
>+	if (info->use_glamor &&
>+	    !radeon_glamor_create_textured_pixmap(pixmap,
> 						  radeon_get_pixmap_private(pixmap))) {
> 		pScreen->DestroyPixmap(pixmap);
> 	  	return NULL;
>diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
>index f00967f..4b6b024 100644
>--- a/src/radeon_glamor.c
>+++ b/src/radeon_glamor.c
>@@ -153,12 +153,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
> Bool
> radeon_glamor_create_textured_pixmap(PixmapPtr pixmap, struct radeon_pixmap *priv)
> {
>-	ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
>-	RADEONInfoPtr info = RADEONPTR(scrn);
>-
>-	if ((info->use_glamor) == 0)
>-		return TRUE;
>-
> 	return glamor_egl_create_textured_pixmap(pixmap, priv->bo->handle,
> 						 pixmap->devKind);
> }

Actions: View | Splinter Review

Attachments on bug 90169: 115361

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.