From 077bb1bdea0fa9af846c02896df680293cf9e25c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 31 May 2015 15:46:55 -0700 Subject: [PATCH] glamor: Clean up some declarations in glyph rendering. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- glamor/glamor_composite_glyphs.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 39ed854bc..47bf64725 100644 --- a/glamor/glamor_composite_glyphs.c +++ b/glamor/glamor_composite_glyphs.c @@ -331,8 +331,6 @@ glamor_composite_glyphs(CARD8 op, ScreenPtr screen = drawable->pScreen; glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_program *prog = NULL; - PicturePtr glyph_pict = NULL; - DrawablePtr glyph_draw; glamor_program_render *glyphs_program = &glamor_priv->glyphs_program; struct glamor_glyph_atlas *glyph_atlas = NULL; int x = 0, y = 0; @@ -360,11 +358,10 @@ glamor_composite_glyphs(CARD8 op, /* Glyph not empty? */ if (glyph->info.width && glyph->info.height) { - glamor_pixmap_private *glyph_pix_priv; - - glyph_pict = GlyphPicture(glyph)[screen_num]; - glyph_draw = glyph_pict->pDrawable; - glyph_pix_priv = glamor_get_pixmap_private((PixmapPtr) glyph_draw); + 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? */