xserver: Branch 'master'

[Eric Anholt]

 glamor/glamor_egl.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 06419a5b17180126d2507c8699229e07f5b2c434
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Jun 29 01:55:25 2017 +0100

    glamor: remove no longer needed KHR_gl_texture_2D_image requirement
    
    The code that needed it was introduced with commit 7cfd9cc2327 ("Add
    DRI3 support to glamor") back in 2013. And was nuked a couple of years
    ago with commit 51984dddfcc ("glamor: Delay making pixmaps shareable
    until we need to.")
    
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index b0d3e9efe..53a74b8da 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -665,7 +665,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
 		goto error;  \
 	}
 
-    GLAMOR_CHECK_EGL_EXTENSION(KHR_gl_texture_2D_image);
     GLAMOR_CHECK_EGL_EXTENSION(KHR_surfaceless_context);
 
     if (eglBindAPI(EGL_OPENGL_API)) {