xserver: Branch 'master' - 3 commits

[Eric Anholt]

 glamor/glamor.c |   27 ++++++++++++++-------------
 man/Xserver.man |    2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit ea03e314f98e5d8ed7bf7a508006a3d84014bde5
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jul 27 13:54:00 2015 -0700

    glamor: Don't try to free the pixmap priv if we fail to allocate FBO.
    
    Fixes a regression since a2a2f6e34bd49e7ae31779274d52e800595660bc.  I
    missed this in testing on x86, because we never fail to allocate an
    FBO.  We do hit this path on VC4, though.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 439906a..d4a0236 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -194,7 +194,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
 
     if (fbo == NULL) {
         fbDestroyPixmap(pixmap);
-        free(pixmap_priv);
         return fbCreatePixmap(screen, w, h, depth, usage);
     }
 
commit 6916d32ab3ec1aa922094abce7fac22884ee4e83
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jul 19 08:24:39 2015 -0700

    Xserver.man: -retro is used when starting the server, not the stipple
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/man/Xserver.man b/man/Xserver.man
index 3bf844f..ac410cd 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -238,7 +238,7 @@ turns off auto-repeat.
 turns on auto-repeat.
 .TP 8
 .B -retro
-starts the stipple with the classic stipple and cursor visible.  The default
+starts the server with the classic stipple and cursor visible.  The default
 is to start with a black root window, and to suppress display of the cursor
 until the first time an application calls XDefineCursor(). For kdrive
 servers, this implies -zap.
commit 0a458a908ec071a4da5d22c760581e0c5ec885ce
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Jul 22 15:37:23 2015 +0900

    glamor: Make our EGL context current before calling into GL in glamor_init
    
    Without this, the context of another screen may be current, or no context
    at all if glamor_egl_init failed for another screen.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 6dcc259..439906a 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -457,6 +457,20 @@ glamor_init(ScreenPtr screen, unsigned int flags)
         goto fail;
     }
 
+    glamor_priv->saved_procs.close_screen = screen->CloseScreen;
+    screen->CloseScreen = glamor_close_screen;
+
+    /* If we are using egl screen, call egl screen init to
+     * register correct close screen function. */
+    if (flags & GLAMOR_USE_EGL_SCREEN) {
+        glamor_egl_screen_init(screen, &glamor_priv->ctx);
+    } else {
+        if (!glamor_glx_screen_init(&glamor_priv->ctx))
+            goto fail;
+    }
+
+    glamor_make_current(glamor_priv);
+
     if (epoxy_is_desktop_gl())
         glamor_priv->gl_flavor = GLAMOR_GL_DESKTOP;
     else
@@ -579,18 +593,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
 
     glamor_set_debug_level(&glamor_debug_level);
 
-    glamor_priv->saved_procs.close_screen = screen->CloseScreen;
-    screen->CloseScreen = glamor_close_screen;
-
-    /* If we are using egl screen, call egl screen init to
-     * register correct close screen function. */
-    if (flags & GLAMOR_USE_EGL_SCREEN) {
-        glamor_egl_screen_init(screen, &glamor_priv->ctx);
-    } else {
-        if (!glamor_glx_screen_init(&glamor_priv->ctx))
-            goto fail;
-    }
-
     glamor_priv->saved_procs.create_screen_resources =
         screen->CreateScreenResources;
     screen->CreateScreenResources = glamor_create_screen_resources;