frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Unconditionalize GLAMOR_TEXTURED_LARGE_PIXMAP 

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Adam Jackson 2017-10-24 14:28:34 -04:00
parent 1edac5c1ce
commit 2230e6c8af
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor.c
View File

@ -183,9 +183,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
w <= glamor_priv->glyph_max_dim && w <= glamor_priv->glyph_max_dim &&
h <= glamor_priv->glyph_max_dim) h <= glamor_priv->glyph_max_dim)
|| (w == 0 && h == 0) || (w == 0 && h == 0)
|| !glamor_check_pixmap_fbo_depth(depth)) || !glamor_check_pixmap_fbo_depth(depth)))
|| (!GLAMOR_TEXTURED_LARGE_PIXMAP &&
!glamor_check_fbo_size(glamor_priv, w, h)))
return fbCreatePixmap(screen, w, h, depth, usage); return fbCreatePixmap(screen, w, h, depth, usage);
else else
pixmap = fbCreatePixmap(screen, 0, 0, depth, usage); pixmap = fbCreatePixmap(screen, 0, 0, depth, usage);

1
glamor/glamor_priv.h
View File

@ -910,7 +910,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
#include "glamor_utils.h" #include "glamor_utils.h"
#define GLAMOR_TEXTURED_LARGE_PIXMAP 1
#if 0 #if 0
#define MAX_FBO_SIZE 32 /* For test purpose only. */ #define MAX_FBO_SIZE 32 /* For test purpose only. */
#endif #endif