From cd608a516d2c59ebfb95fadfecf68227888c0e4e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 30 Jun 2015 20:25:06 -0700 Subject: [PATCH] glamor: Reuse the glamor_is_memory helper. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Anholt Reviewed-by: Michel Dänzer Reviewed-by: Keith Packard --- 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 cd88524df..389c8f440 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);