diff options
| author | Eric Anholt <eric@anholt.net> | 2015-05-31 15:46:55 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-06-18 10:39:14 -0700 |
| commit | 5ce21546cca10c8ffb54ad53569c0bf9bd88bf21 (patch) | |
| tree | 627b98c658c30b583eaa418a98ccd1d4792459d6 | |
| parent | fcfae2e8f6c13d538bbcb0154a72f79308137366 (diff) | |
glamor: Clean up some declarations in glyph rendering.
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | glamor/glamor_composite_glyphs.c | 11 |
1 files 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? */ |