diff options
| author | Eric Anholt <eric@anholt.net> | 2015-06-30 20:25:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-07-10 09:42:57 -0700 |
| commit | cd608a516d2c59ebfb95fadfecf68227888c0e4e (patch) | |
| tree | d8e41b408a62cdcadfc4d948c084b9b0f3463b95 | |
| parent | 90db5edf119187f8b1b9207c8c384d6cd7ef9edc (diff) | |
glamor: Reuse the glamor_is_memory helper.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor_composite_glyphs.c | 4 |
1 files changed, 1 insertions, 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); |