xf86-video-intel: src/sna/sna_glyphs.c

[Chris Wilson]

 src/sna/sna_glyphs.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0e397e4a1dc23ed07089c967612d705584f3b376
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 14 21:35:23 2012 +0100

    sna/glyphs: Perform the fallback mask reduce before moving the glyph pointers
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 80c0b74..2822368 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -1316,6 +1316,11 @@ glyphs_fallback(CARD8 op,
 	}
 	RegionTranslate(&region, -dst->pDrawable->x, -dst->pDrawable->y);
 
+	if (mask_format &&
+	    (op_is_bounded(op) || (nlist == 1 && list->len == 1)) &&
+	    mask_format == glyphs_format(nlist, list, glyphs))
+		mask_format = NULL;
+
 	cache = sna->render.glyph_cache;
 	pixman_glyph_cache_freeze(cache);
 
@@ -1377,11 +1382,6 @@ next:
 	if (dst_image == NULL)
 		goto out_free_src;
 
-	if (mask_format &&
-	    (op_is_bounded(op) || (nlist == 1 && list->len == 1)) &&
-	    mask_format == glyphs_format(nlist, list, glyphs))
-		mask_format = NULL;
-
 	if (mask_format) {
 		pixman_composite_glyphs(op, src_image, dst_image,
 					mask_format->format | (mask_format->depth << 24),