From 552d40b26a082df6f1816bb461793b8fa8b553c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 8 Apr 2014 09:17:51 -0700 Subject: [PATCH 1/4] xwayland: Build without GLX extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Daniel Stone Signed-off-by: Kristian Høgsberg --- hw/xwayland/xwayland.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index c2c6481af..5cecefd3a 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -616,8 +616,10 @@ xwl_log_handler(const char *format, va_list args) FatalError("%s", msg); } -static const ExtensionModule glx_extension[] = { +static const ExtensionModule xwayland_extensions[] = { +#ifdef GLXEXT { GlxExtensionInit, "GLX", &noGlxExtension }, +#endif }; void @@ -639,7 +641,8 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv) screen_info->bitmapBitOrder = BITMAP_BIT_ORDER; screen_info->numPixmapFormats = ARRAY_SIZE(depths); - LoadExtensionList(glx_extension, ARRAY_SIZE(glx_extension), FALSE); + LoadExtensionList(xwayland_extensions, + ARRAY_SIZE(xwayland_extensions), FALSE); /* Cast away warning from missing printf annotation for * wl_log_func_t. Wayland 1.5 will have the annotation, so we can From f618455c802abb77de8d64eb442422cfe5e26ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 8 Apr 2014 09:19:13 -0700 Subject: [PATCH 2/4] xwayland: Build without xshmfence MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Daniel Stone Signed-off-by: Kristian Høgsberg --- hw/xwayland/xwayland.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 5cecefd3a..844745a08 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -573,8 +573,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) fbPictureInit(pScreen, 0, 0); +#ifdef HAVE_XSHMFENCE if (!miSyncShmScreenInit(pScreen)) return FALSE; +#endif xwl_screen->wayland_fd = wl_display_get_fd(xwl_screen->display); AddGeneralSocket(xwl_screen->wayland_fd); From d2c6e801b548674b8636e6a64b42c9038d46263c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 8 Apr 2014 09:23:42 -0700 Subject: [PATCH 3/4] configure.ac: Remove check for WAYLAND_SCANNER_RULES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes configure fail if the wayland autoconf macros aren't found. We don't need the scanner for shm-only xwayland so just drop this line for now. Reviewed-by: Daniel Stone Reviewed-by: Gaetan Nadon Reviewed-by: Jeremy Huddleston Sequoia Signed-off-by: Kristian Høgsberg --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index bfe1fc947..4563dc717 100644 --- a/configure.ac +++ b/configure.ac @@ -2458,7 +2458,6 @@ if test "x$XWAYLAND" = xyes; then XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" AC_SUBST([XWAYLAND_LIBS]) AC_SUBST([XWAYLAND_SYS_LIBS]) - WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland']) fi From 66b602474047c499b8a888267a489790fc9f9d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 21 Apr 2014 11:14:51 -0700 Subject: [PATCH 4/4] xwayland: Remove left-over ErrorF logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Jasper St. Pierre Signed-off-by: Kristian Høgsberg --- hw/xwayland/xwayland.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 844745a08..b966e5070 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -218,7 +218,6 @@ xwl_realize_window(WindowPtr window) screen->RealizeWindow = xwl_realize_window; if (xwl_screen->rootless && !window->parent) { - ErrorF("Clearing root clip\n"); RegionNull(&window->clipList); RegionNull(&window->borderClip); RegionNull(&window->winSize);