diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-12 13:02:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-12 13:02:43 +0100 |
| commit | 4d3cafc99ab49da6744046bc2004981144cb064d (patch) | |
| tree | 458e5c1209cb9c705632e0afe247da21ecd2e732 /src | |
| parent | dc18eaa585c36c8e5f5b4ec405a976a835fd2ac3 (diff) | |
sna: Fix compilation without pixman glyphs
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_glyphs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index 54ad510c..db9af143 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -1298,15 +1298,11 @@ glyphs_fallback(CARD8 op, int nlist, GlyphListPtr list, GlyphPtr *glyphs) { struct sna *sna = to_sna_from_drawable(dst->pDrawable); - pixman_glyph_t stack_glyphs[N_STACK_GLYPHS]; - pixman_glyph_t *pglyphs = stack_glyphs; pixman_image_t *src_image, *dst_image; - pixman_glyph_cache_t *cache; - int dst_x = list->xOff, dst_y = list->yOff; - int src_dx, src_dy, dst_dx, dst_dy; + int src_dx, src_dy; ScreenPtr screen = dst->pDrawable->pScreen; RegionRec region; - int x, y, count, n; + int x, y, n; glyph_extents(nlist, list, glyphs, ®ion.extents); if (region.extents.x2 <= region.extents.x1 || @@ -1356,7 +1352,12 @@ glyphs_fallback(CARD8 op, #if HAS_PIXMAN_GLYPHS if (sna->render.glyph_cache) { - cache = sna->render.glyph_cache; + pixman_glyph_t stack_glyphs[N_STACK_GLYPHS]; + pixman_glyph_t *pglyphs = stack_glyphs; + pixman_glyph_cache_t *cache = sna->render.glyph_cache; + int dst_x = list->xOff, dst_y = list->yOff; + int dst_dx, dst_dy, count; + pixman_glyph_cache_freeze(cache); count = 0; |