From 2b23605efba009fb340ec10b37d54caae159b9b1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 15 Jun 2012 15:28:31 +0100 Subject: [PATCH] sna: Don't trim prepare for glyphs_via_mask If we pass the expected width/height without passing the per-glyph offset into the preparation function, we make the erroneous mistake of analysing the glyph cache only for the mask extents and so will miss glyphs that we need to upload for the operation. Signed-off-by: Chris Wilson --- src/sna/sna_glyphs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 63a62873..b06bcda2 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -978,13 +978,13 @@ next_image: ok = sna->render.composite(sna, PictOpAdd, this_atlas, NULL, mask, 0, 0, 0, 0, 0, 0, - width, height, + 0, 0, &tmp); } else { ok = sna->render.composite(sna, PictOpAdd, sna->render.white_picture, this_atlas, mask, 0, 0, 0, 0, 0, 0, - width, height, + 0, 0, &tmp); } if (!ok) {