diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-15 15:29:59 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-15 15:41:08 +0100 |
| commit | d1713941e9db3e7a6d83466be1b253978fb4bf01 (patch) | |
| tree | e127a6a933520040185fabc992c205d3e1657594 /src/sna/sna_glyphs.c | |
| parent | 2b23605efba009fb340ec10b37d54caae159b9b1 (diff) | |
sna: Tweaks for DBG missing glyphs through fallbacks
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_glyphs.c')
| -rw-r--r-- | src/sna/sna_glyphs.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index b06bcda2..17c42d53 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -226,20 +226,22 @@ bail: } static void -glyph_cache_upload(ScreenPtr screen, - struct sna_glyph_cache *cache, - GlyphPtr glyph, +glyph_cache_upload(struct sna_glyph_cache *cache, + GlyphPtr glyph, PicturePtr glyph_picture, int16_t x, int16_t y) { DBG(("%s: upload glyph %p to cache (%d, %d)x(%d, %d)\n", - __FUNCTION__, glyph, x, y, glyph->info.width, glyph->info.height)); + __FUNCTION__, + glyph, x, y, + glyph_picture->pDrawable->width, + glyph_picture->pDrawable->height)); sna_composite(PictOpSrc, - GetGlyphPicture(glyph, screen), 0, cache->picture, + glyph_picture, 0, cache->picture, 0, 0, 0, 0, x, y, - glyph->info.width, - glyph->info.height); + glyph_picture->pDrawable->width, + glyph_picture->pDrawable->height); } static void @@ -392,7 +394,7 @@ glyph_cache(ScreenPtr screen, pos >>= 2; } - glyph_cache_upload(screen, cache, glyph, + glyph_cache_upload(cache, glyph, glyph_picture, priv->coordinate.x, priv->coordinate.y); return TRUE; |