diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-18 15:04:22 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-18 15:11:24 +0000 |
| commit | 308f0208de59620190dd3cb65b3243d2e8a7bd87 (patch) | |
| tree | 05a1a933bec93801f09c33bcadb2dcb53adc42c1 | |
| parent | 4a37d57f9633bbd29f308239c1cd956767b277c0 (diff) | |
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 <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_glyphs.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |