andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Reuse the glamor_is_memory helper.

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2015-06-30 20:25:06 -07:00
parent 90db5edf11
commit cd608a516d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glamor/glamor_composite_glyphs.c
View File

@ -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);