summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-15 15:28:31 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-15 15:28:31 +0100
commit2b23605efba009fb340ec10b37d54caae159b9b1 (patch)
tree0f504d4129b9c64b2b2e7d23b44f1f98da035774 /src
parent9f66b27114fcc457fa5cb2d5889e875384f89e75 (diff)
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_glyphs.c4
1 files 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) {