Attachment 93349 Details for Bug 74494 – Reset composite state between switching glyph formats

[patch] Reset composite state between switching glyph formats

0001-sna-glyphs-Reset-composite-state-between-switching-g.patch (text/plain), 1.32 KB, created by Chris Wilson on 2014-02-04 09:47:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-02-04 09:47:30 UTC

Size: 1.32 KB

patch

obsolete

>From 363ea0873bc00467850653144ed0a2910c91618d Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 4 Feb 2014 08:51:17 +0000
>Subject: [PATCH] sna/glyphs: Reset composite state between switching glyph
> formats
>
>One path uses the mask channel, the other does not. We cannot rely on
>overwriting all reused state in this case, and so we must clear the
>composite state prior to use each time.
>
>Reported-by: Arkadiusz Miskiewicz <arekm@maven.pl>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74494
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_glyphs.c |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
>index d06d52a..c72c5e5 100644
>--- a/src/sna/sna_glyphs.c
>+++ b/src/sna/sna_glyphs.c
>@@ -1306,7 +1306,6 @@ next_image:
> 		if (!clear_pixmap(sna, pixmap))
> 			goto err_mask;
> 
>-		memset(&tmp, 0, sizeof(tmp));
> 		glyph_atlas = NULL;
> 		do {
> 			int n = list->len;
>@@ -1346,6 +1345,8 @@ next_image:
> 					     __FUNCTION__,
> 					     (int)p->atlas->format,
> 					     (int)(format->depth << 24 | format->format)));
>+
>+					memset(&tmp, 0, sizeof(tmp));
> 					if (p->atlas->format == (format->depth << 24 | format->format)) {
> 						ok = sna->render.composite(sna, PictOpAdd,
> 									   p->atlas, NULL, mask,
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 74494: 93346 | 93349

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.