From 4fd46b8bb7e7a104a0afa0e5dee92993e043ef57 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 25 Sep 2011 10:02:02 +0100
Subject: [PATCH] sna/glyphs: Add glyphs directly onto a client temporary
 buffer

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_glyphs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 0f0dc09f..4db5bafb 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -1139,7 +1139,7 @@ sna_glyphs(CARD8 op,
 
 	/* XXX discard the mask for non-overlapping glyphs? */
 
-	if (!mask) {
+	if (!mask || (op == PictOpAdd && dst->format == mask->format)) {
 		if (glyphs_to_dst(sna, op,
 				  src, dst,
 				  src_x, src_y,