xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor_egl.h |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 29a4f3db60fdeaef7bca3aa2746bb43a1850fddd
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jan 2 15:38:08 2017 -0500

    glamor: Squash unused variable warning
    
    Accidentally introduced in 05e19644.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
index 2c6d307..6bb1185 100644
--- a/glamor/glamor_egl.h
+++ b/glamor/glamor_egl.h
@@ -60,8 +60,6 @@
 static inline EGLDisplay
 glamor_egl_get_display(EGLint type, void *native)
 {
-    EGLDisplay dpy = NULL;
-
     /* In practise any EGL 1.5 implementation would support the EXT extension */
     if (epoxy_has_egl_extension(NULL, "EGL_EXT_platform_base")) {
         PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT =