diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-29 20:48:40 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-03-24 12:01:39 -0700 |
| commit | 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342 (patch) | |
| tree | 9c7e1f6e1788ef0b67acd17db5c396c081813869 /glamor | |
| parent | c6ab13566798c7adff23a609575a7ac2d1ce2df6 (diff) | |
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 <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor.h | 1 | ||||
| -rw-r--r-- | glamor/glamor_picture.c | 10 |
2 files changed, 0 insertions, 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; |