xserver: Branch 'master'

[Keith Packard]

 glamor/glamor_composite_glyphs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d6230e77348e550c90e00c007b113ce38c81d12
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jun 14 17:09:07 2016 -0700

    glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap
    
    Nice of FreePicture to take a void * instead of a PicturPtr so that
    this error wasn't caught by the compiler.
    
    Noticed when resetting the X server left a dangling pixmap around.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index 50fd026..cc0aa6f 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -557,7 +557,7 @@ glamor_free_glyph_atlas(struct glamor_glyph_atlas *atlas)
     if (!atlas)
         return;
     if (atlas->atlas)
-        FreePicture(atlas->atlas, 0);
+        (*atlas->atlas->drawable.pScreen->DestroyPixmap)(atlas->atlas);
     free (atlas);
 }