diff options
author | Adam Jackson <ajax@redhat.com> | 2017-10-24 14:28:34 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2017-10-30 13:16:50 -0400 |
commit | 2230e6c8af92b041821eee0ea6210eda82c74106 (patch) | |
tree | 0185018dddffb07f1b73cb57601d716a6884a161 /glamor | |
parent | 1edac5c1ceb8b21af45b20397ff64177ad22466c (diff) |
glamor: Unconditionalize GLAMOR_TEXTURED_LARGE_PIXMAP
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor')
-rw-r--r-- | glamor/glamor.c | 4 | ||||
-rw-r--r-- | glamor/glamor_priv.h | 1 |
2 files changed, 1 insertions, 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 |