From bf7a3bcb00d0dce22ff3fe42fe6236beeab4403b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 31 May 2015 15:28:39 -0700 Subject: [PATCH] glamor: Actually allow glyphs of dimension 65 to 128 in the cache. The cache was trying to allow glyph_max_dim in, but since we were putting over 64x64 into HW memory, it would end up in the single-glyph-per-render bail_one path. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- glamor/glamor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 807f28ebd..71ca4f425 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -160,7 +160,9 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth, return NullPixmap; if ((usage == GLAMOR_CREATE_PIXMAP_CPU - || (usage == CREATE_PIXMAP_USAGE_GLYPH_PICTURE && w <= 64 && h <= 64) + || (usage == CREATE_PIXMAP_USAGE_GLYPH_PICTURE && + 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 &&