From 8bb4b11298c285d2cd1eb28e65729933ec386829 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Fri, 23 Sep 2016 16:56:06 +0300 Subject: [PATCH] glamor: Make glamor_name_from_pixmap work without DRI3 This function is used by the modesetting driver to implement DRI2 and shouldn't fail on systems that don't support DRI3. v2: Drop stale commit message wording, fix compiler warning (by anholt) Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- glamor/glamor.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 903f6bdf6..45cc0952e 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -845,11 +845,7 @@ int glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size) { glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); - glamor_screen_private *glamor_priv = - glamor_get_screen_private(pixmap->drawable.pScreen); - if (!glamor_priv->dri3_enabled) - return -1; switch (pixmap_priv->type) { case GLAMOR_TEXTURE_DRM: case GLAMOR_TEXTURE_ONLY: