xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-glamor.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 975d3a509667579b81d88616b91491472059354d
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 30 14:10:26 2018 -0400

    xwayland: Avoid using epoxy_has_egl()
    
    There's no real point - if we don't have EGL then the extension check is
    also going to fail - and the entrypoint is new in 1.5.0, which we don't
    need to require yet.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Mario Kleiner <mario.kleiner.de at gmail.com>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 2bd16e7ac..cdca072ed 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -55,8 +55,7 @@ xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen)
 Bool
 xwl_glamor_egl_supports_device_probing(void)
 {
-    return epoxy_has_egl() &&
-        epoxy_has_egl_extension(NULL, "EGL_EXT_device_base");
+    return epoxy_has_egl_extension(NULL, "EGL_EXT_device_base");
 }
 
 void **