xserver: Branch 'master' - 3 commits

[Adam Jackson]

 glamor/glamor_egl.c            |   11 ++++++-----
 hw/xfree86/common/xf86Config.c |    5 -----
 hw/xwayland/xwayland-glamor.c  |    3 ++-
 3 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit aa5390aa83be55f887e3b4f78681b4f3d3386eb5
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon May 9 14:18:32 2016 -0400

    xfree86: Remove redundant parse of AIGLX server flag
    
    Not visible in the patch, but the same stanza is repeated below inside
    the #ifdef GLXEXT. There's no reason to bother with checking it if we
    built without GLXEXT so remove the unconditional one.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 5a9f8d2..2dbefba 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -898,11 +898,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
     xf86Info.aiglx = TRUE;
     xf86Info.aiglxFrom = X_DEFAULT;
-    if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
-        xf86Info.aiglx = value;
-        xf86Info.aiglxFrom = X_CONFIG;
-    }
-
 #ifdef GLXEXT
     xf86Info.glxVisuals = XF86_GlxVisualsTypical;
     xf86Info.glxVisualsFrom = X_DEFAULT;
commit 166d4c817897f5aa197f639bf06b5b3e04994496
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jun 3 10:25:20 2016 +0900

    xwayland: Call eglBindAPI after eglInitialize
    
    Current Mesa Git master checks that the EGL display actually supports
    the API passed to eglBindAPI, which can only succeed after
    eglInitialize.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index ad66cf6..73ccd71 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -298,12 +298,13 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
         return;
     }
 
-    eglBindAPI(EGL_OPENGL_API);
     if (!eglInitialize(xwl_screen->egl_display, &major, &minor)) {
         ErrorF("eglInitialize() failed\n");
         return;
     }
 
+    eglBindAPI(EGL_OPENGL_API);
+
     version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
     ErrorF("glamor: EGL version %s:\n", version);
 
commit d798b8318adf298bc23166e74f31e49805f0d881
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jun 3 10:25:19 2016 +0900

    glamor: Call eglBindAPI after eglInitialize
    
    Current Mesa Git master checks that the EGL display actually supports
    the API passed to eglBindAPI, which can only succeed after
    eglInitialize.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 4bcd3ce..16a20a7 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
 
     glamor_egl->has_gem = glamor_egl_check_has_gem(fd);
 
-#ifndef GLAMOR_GLES2
-    eglBindAPI(EGL_OPENGL_API);
-#else
-    eglBindAPI(EGL_OPENGL_ES_API);
-#endif
     if (!eglInitialize
         (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
         xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
@@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
         goto error;
     }
 
+#ifndef GLAMOR_GLES2
+    eglBindAPI(EGL_OPENGL_API);
+#else
+    eglBindAPI(EGL_OPENGL_ES_API);
+#endif
+
     version = eglQueryString(glamor_egl->display, EGL_VERSION);
     xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);