From af4d3853ae8f834fbf2fc55fb2b397b3f7f17656 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 24 Sep 2011 19:26:46 +0100 Subject: [PATCH] sna/glyphs: Convert all sub-8bpp masks to a8 Signed-off-by: Chris Wilson --- src/sna/sna_glyphs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 709517f9..e0ef3133 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -721,13 +721,10 @@ glyphs_via_mask(struct sna *sna, src_x += box.x1 - list->xOff; src_y += box.y1 - list->yOff; - if (format->depth == 1) { - PictFormatPtr a8Format = - PictureMatchFormat(screen, 8, PICT_a8); - if (!a8Format) + if (format->depth < 8) { + format = PictureMatchFormat(screen, 8, PICT_a8); + if (!format) return FALSE; - - format = a8Format; } pixmap = screen->CreatePixmap(screen,