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;