Attachment 21885 Details for Bug 19233 – Don't use component-alpha mask for non-component-alpha glyphs

[patch] Don't use component-alpha mask for non-component-alpha glyphs

exa_glyphs.diff (text/plain), 1.43 KB, created by Michel Dänzer on 2009-01-11 09:02:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2009-01-11 09:02:57 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
>index 169763f..a05e897 100644
>--- a/exa/exa_glyphs.c
>+++ b/exa/exa_glyphs.c
>@@ -768,26 +777,26 @@ exaGlyphs (CARD8 	 op,
>     CARD32	component_alpha;
>     ExaGlyphBuffer buffer;
> 
>-    /* If we don't have a mask format but all the glyphs have the same format
>-     * and don't intersect, use the glyph format as mask format for the full
>-     * benefits of the glyph cache.
>+    /* If we don't have a mask format or it doesn't match the glyph format, but
>+     * all the glyphs have the same format and don't intersect, use the glyph
>+     * format as mask format for the full benefits of the glyph cache.
>      */
>-    if (!maskFormat) {
>+    if (!maskFormat || (NeedsComponent(maskFormat->format) &&
>+			!NeedsComponent(list[0].format->format))) {
>        Bool sameFormat = TRUE;
>+       PictFormatPtr format = list[0].format;
>        int i;
> 
>-       maskFormat = list[0].format;
>-
>        for (i = 0; i < nlist; i++) {
>-           if (maskFormat->format != list[i].format->format) {
>+           if (format->format != list[i].format->format) {
>                sameFormat = FALSE;
>                break;
>            }
>        }
> 
>-       if (!sameFormat || (maskFormat->depth != 1 &&
>-			   exaGlyphsIntersect(nlist, list, glyphs))) {
>-	   maskFormat = NULL;
>+       if (sameFormat && (maskFormat || format->depth == 1 ||
>+			  !exaGlyphsIntersect(nlist, list, glyphs))) {
>+	   maskFormat = format;
>        }
>     }
>

Actions: View | Splinter Review

Attachments on bug 19233: 21395 | 21401 | 21402 | 21541 | 21543 | 21843 | 21885 | 21934

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.