xserver: Branch 'xwayland' - 2 commits

[Kristian Høgsberg]

 hw/xfree86/common/xf86AutoConfig.c    |    1 +
 hw/xfree86/xwayland/xwayland-window.c |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f79b335ff4c5ce68a8a2b4603b74ad966948c37
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Oct 11 16:14:54 2013 -0700

    xwayland: Also look for wlglamor

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index b35cb96..9576b86 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -285,6 +285,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
     if (i < (nmatches - 1)) {
 #ifdef XORG_WAYLAND
         if (xorgWayland)
+            matches[i++] = xnfstrdup("wlglamor");
             matches[i++] = xnfstrdup("wayland");
         else
 #endif
commit c3b034d92923b1371115cc4db91ed39c7f22cc73
Author: Daniel Stone <daniels at collabora.com>
Date:   Thu Sep 12 16:58:00 2013 -0400

    XWayland: Don't commit empty surfaces
    
    Instead of attaching, damaging and then committing a new buffer as soon
    as we allocate a pixmap, just attach and damage the entire buffer.  When
    the buffer is changed, we'll commit the changes.
    
    This avoids an ugly black (on SHM) flash when a window is mapped or
    resized.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index 20db80c..5045e65 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -80,7 +80,6 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)
     wl_surface_damage(xwl_window->surface, 0, 0,
 		      pixmap->drawable.width,
 		      pixmap->drawable.height);
-    wl_surface_commit(xwl_window->surface);
 
     callback = wl_display_sync(xwl_screen->display);
     wl_callback_add_listener(callback, &free_pixmap_listener, pixmap);