[PATCH xserver 3/3] glamor: Unconditionalize GLAMOR_TEXTURED_LARGE_PIXMAP

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glamor/glamor.c      | 4 +---
 glamor/glamor_priv.h | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index c55ba249e..b70759b65 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -183,9 +183,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
              w <= glamor_priv->glyph_max_dim &&
              h <= glamor_priv->glyph_max_dim)
          || (w == 0 && h == 0)
-         || !glamor_check_pixmap_fbo_depth(depth))
-        || (!GLAMOR_TEXTURED_LARGE_PIXMAP &&
-            !glamor_check_fbo_size(glamor_priv, w, h)))
+         || !glamor_check_pixmap_fbo_depth(depth)))
         return fbCreatePixmap(screen, w, h, depth, usage);
     else
         pixmap = fbCreatePixmap(screen, 0, 0, depth, usage);
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 5da400a37..ad54b3197 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -910,7 +910,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
 
 #include "glamor_utils.h"
 
-#define GLAMOR_TEXTURED_LARGE_PIXMAP 1
 #if 0
 #define MAX_FBO_SIZE 32         /* For test purpose only. */
 #endif
-- 
2.14.2