xserver: Branch 'xwayland-1.12'

[Kristian Høgsberg]

 hw/xfree86/xwayland/xwayland-drm.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 054cb83efdaba3b911ce2c09a699fc7ab3867f31
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Wed May 16 16:08:14 2012 -0400

    xwayland: Always create drm buffers as WL_DRM_FORMAT_ARGB8888
    
    The compositor can render an ARGB window decoration and needs to sample
    ARGB for that region of the window, even if the visual is only depth 24.

diff --git a/hw/xfree86/xwayland/xwayland-drm.c b/hw/xfree86/xwayland/xwayland-drm.c
index 7451ae8..ec5d327 100644
--- a/hw/xfree86/xwayland/xwayland-drm.c
+++ b/hw/xfree86/xwayland/xwayland-drm.c
@@ -165,18 +165,13 @@ xwl_create_window_buffer_drm(struct xwl_window *xwl_window,
 	if (screen->visuals[i].vid == visual)
 	    break;
 
-    if (screen->visuals[i].nplanes == 32)
-	format = WL_DRM_FORMAT_ARGB8888;
-    else
-	format = WL_DRM_FORMAT_XRGB8888;
-
     xwl_window->buffer =
       wl_drm_create_buffer(xwl_window->xwl_screen->drm,
 			   name,
 			   pixmap->drawable.width,
 			   pixmap->drawable.height,
 			   pixmap->devKind,
-			   format);
+			   WL_DRM_FORMAT_ARGB8888);
 
     return xwl_window->buffer ? Success : BadDrawable;
 }