xserver: Branch 'master' - 2 commits

[Eric Anholt]

 glamor/glamor.c      |    4 ----
 glamor/glamor_sync.c |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ba199cb90157cefab01183f2e2c909895df73321
Author: Mark Kettenis <kettenis at openbsd.org>
Date:   Tue Nov 17 22:31:21 2015 +0100

    glamor: Make glamor_sync_init work with --disable-xshmfence
    
    Signed-off-by: Mark Kettenis <kettenis at openbsd.org>
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/glamor/glamor_sync.c b/glamor/glamor_sync.c
index fbc47d4..907e0c6 100644
--- a/glamor/glamor_sync.c
+++ b/glamor/glamor_sync.c
@@ -97,6 +97,9 @@ glamor_sync_init(ScreenPtr screen)
 #ifdef HAVE_XSHMFENCE
 	if (!miSyncShmScreenInit(screen))
 		return FALSE;
+#else
+	if (!miSyncSetup(screen))
+		return FALSE;
 #endif
 
 	screen_funcs = miSyncGetScreenFuncs(screen);
commit 8bb4b11298c285d2cd1eb28e65729933ec386829
Author: Matthieu Herrb <matthieu at herrb.eu>
Date:   Fri Sep 23 16:56:06 2016 +0300

    glamor: Make glamor_name_from_pixmap work without DRI3
    
    This function is used by the modesetting driver to implement DRI2 and
    shouldn't fail on systems that don't support DRI3.
    
    v2: Drop stale commit message wording, fix compiler warning (by anholt)
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 903f6bd..45cc095 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -845,11 +845,7 @@ int
 glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
 {
     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-    glamor_screen_private *glamor_priv =
-        glamor_get_screen_private(pixmap->drawable.pScreen);
 
-    if (!glamor_priv->dri3_enabled)
-        return -1;
     switch (pixmap_priv->type) {
     case GLAMOR_TEXTURE_DRM:
     case GLAMOR_TEXTURE_ONLY: