From 308f0208de59620190dd3cb65b3243d2e8a7bd87 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 18 Mar 2013 15:04:22 +0000 Subject: sna: Reset operation state between glyphs We are not resetting sufficient state between operations as we presume that all callers of Composite() currently pass in a blank state. In the long run, we want to remove that burden and do a minimal initialisation. References: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1156387 Signed-off-by: Chris Wilson --- src/sna/sna_glyphs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/sna/sna_glyphs.c') diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 2f44113a..3e2d79bc 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -673,8 +673,6 @@ glyphs_slow(struct sna *sna, if (NO_GLYPHS_SLOW) return false; - memset(&tmp, 0, sizeof(tmp)); - DBG(("%s(op=%d, src=(%d, %d), nlist=%d, dst=(%d, %d)+(%d, %d))\n", __FUNCTION__, op, src_x, src_y, nlist, list->xOff, list->yOff, dst->pDrawable->x, dst->pDrawable->y)); @@ -740,7 +738,7 @@ glyphs_slow(struct sna *sna, y - glyph->info.y, glyph->info.width, glyph->info.height, - &tmp)) + memset(&tmp, 0, sizeof(tmp)))) return false; rects = REGION_RECTS(dst->pCompositeClip); -- cgit v1.2.3