From 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 29 Oct 2014 20:48:40 -0700 Subject: glamor: Eliminate GLAMOR_SEPARATE_TEXTURE pixmap type This was only used to signal when we couldn't ask the DDX to draw to a pixmap; now that we have no DDX-based fallbacks, we don't need to have this type. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- glamor/glamor.h | 1 - glamor/glamor_picture.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index d8419c16e..1a9efc521 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -54,7 +54,6 @@ struct glamor_context; typedef enum glamor_pixmap_type { GLAMOR_MEMORY, GLAMOR_TEXTURE_DRM, - GLAMOR_SEPARATE_TEXTURE, GLAMOR_DRM_ONLY, GLAMOR_TEXTURE_ONLY, GLAMOR_TEXTURE_LARGE, diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index bc658f801..008d1834b 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -69,16 +69,6 @@ glamor_create_picture(PicturePtr picture) glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY); pixmap_priv = glamor_get_pixmap_private(pixmap); } - else { - if (GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) { - /* If the picture format is not compatible with glamor fbo format, - * we have to mark this pixmap as a separated texture, and don't - * fallback to DDX layer. */ - if (pixmap_priv->type == GLAMOR_TEXTURE_DRM - && !glamor_pict_format_is_compatible(picture)) - glamor_set_pixmap_type(pixmap, GLAMOR_SEPARATE_TEXTURE); - } - } pixmap_priv->base.is_picture = 1; pixmap_priv->base.picture = picture; -- cgit v1.2.3