summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-09-24 19:26:46 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-09-24 19:47:41 +0100
commitaf4d3853ae8f834fbf2fc55fb2b397b3f7f17656 (patch)
tree89ced76a3a099558c66feec6fb96c45d1adbb950
parentc79e90da71ae58cb3804f8abaf0541350e47eb14 (diff)
sna/glyphs: Convert all sub-8bpp masks to a8
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_glyphs.c9
1 files 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,