diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-16 10:33:07 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-16 10:33:07 +0100 |
| commit | 10cb36e1ddc6f4bf41941b24d6557343aa595a13 (patch) | |
| tree | dfc917bf8153693b2ef2779acf0c40edd3f0423d | |
| parent | 8f0fc2ed4cc19c90dd2f519080915ca0c54e1baf (diff) | |
sna/glyphs: Add DBG option to force use of the glyph image mask
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_glyphs.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 08351759..1ce71702 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -71,7 +71,7 @@ #define NO_GLYPH_CACHE 0 #define NO_GLYPHS_TO_DST 0 #define NO_GLYPHS_VIA_MASK 0 -#define NO_SMALL_MASK 0 +#define FORCE_SMALL_MASK 0 /* -1 = never, 1 = always */ #define NO_GLYPHS_SLOW 0 #define NO_DISCARD_MASK 0 @@ -1087,6 +1087,17 @@ sna_glyph_get_image(GlyphPtr g, ScreenPtr s) return image; } +static inline bool use_small_mask(struct sna *sna, int16_t width, int16_t height, int depth) +{ + if (FORCE_SMALL_MASK) + return FORCE_SMALL_MASK > 0; + + if (depth * width * height < 8 * 4096) + return true; + + return too_large(sna, width, height); +} + flatten static bool glyphs_via_mask(struct sna *sna, CARD8 op, @@ -1147,9 +1158,7 @@ glyphs_via_mask(struct sna *sna, } component_alpha = NeedsComponent(format->format); - if (!NO_SMALL_MASK && - ((uint32_t)width * height * format->depth < 8 * 4096 || - too_large(sna, width, height))) { + if (use_small_mask(sna, width, height, format->depth)) { pixman_image_t *mask_image; DBG(("%s: small mask [format=%lx, depth=%d, size=%d], rendering glyphs to upload buffer\n", |