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

glamor: Clean up some declarations in glyph rendering.

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2015-05-31 15:46:55 -07:00
parent bf7a3bcb00
commit 077bb1bdea
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glamor/glamor_composite_glyphs.c
View File

@ -331,8 +331,6 @@ glamor_composite_glyphs(CARD8 op,
ScreenPtr screen = drawable->pScreen; ScreenPtr screen = drawable->pScreen;
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
glamor_program *prog = NULL; glamor_program *prog = NULL;
PicturePtr glyph_pict = NULL;
DrawablePtr glyph_draw;
glamor_program_render *glyphs_program = &glamor_priv->glyphs_program; glamor_program_render *glyphs_program = &glamor_priv->glyphs_program;
struct glamor_glyph_atlas *glyph_atlas = NULL; struct glamor_glyph_atlas *glyph_atlas = NULL;
int x = 0, y = 0; int x = 0, y = 0;
@ -360,11 +358,10 @@ glamor_composite_glyphs(CARD8 op,
/* Glyph not empty? /* Glyph not empty?
*/ */
if (glyph->info.width && glyph->info.height) { if (glyph->info.width && glyph->info.height) {
glamor_pixmap_private *glyph_pix_priv; PicturePtr glyph_pict = GlyphPicture(glyph)[screen_num];
DrawablePtr glyph_draw = glyph_pict->pDrawable;
glyph_pict = GlyphPicture(glyph)[screen_num]; glamor_pixmap_private *glyph_pix_priv =
glyph_draw = glyph_pict->pDrawable; glamor_get_pixmap_private((PixmapPtr) glyph_draw);
glyph_pix_priv = glamor_get_pixmap_private((PixmapPtr) glyph_draw);
/* Need to draw with slow path? /* Need to draw with slow path?
*/ */