Signed-off-by: Eric Anholt <e...@anholt.net> --- glamor/glamor_composite_glyphs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index cd88524..389c8f4 100644 --- a/glamor/glamor_composite_glyphs.c +++ b/glamor/glamor_composite_glyphs.c @@ -376,14 +376,12 @@ glamor_composite_glyphs(CARD8 op, if (glyph->info.width && glyph->info.height) { PicturePtr glyph_pict = GlyphPicture(glyph)[screen_num]; DrawablePtr glyph_draw = glyph_pict->pDrawable; - glamor_pixmap_private *glyph_pix_priv = - glamor_get_pixmap_private((PixmapPtr) glyph_draw); /* Need to draw with slow path? */ if (_X_UNLIKELY(glyph_draw->width > glyph_max_dim || glyph_draw->height > glyph_max_dim || - (glyph_pix_priv != 0 && glyph_pix_priv->type != GLAMOR_MEMORY))) + !glamor_pixmap_is_memory((PixmapPtr)glyph_draw))) { if (glyphs_queued) { glamor_glyphs_flush(op, src, dst, prog, glyph_atlas, glyphs_queued); -- 2.1.4 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel