xserver: Branch 'master' - 5 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Apr 21 15:00:34 PDT 2014
configure.ac | 1 -
hw/xwayland/xwayland.c | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009
Merge: 9c86d5f 66b6024
Author: Keith Packard <keithp at keithp.com>
Date: Mon Apr 21 14:59:51 2014 -0700
Merge remote-tracking branch 'krh/xwayland-for-keithp'
commit 66b602474047c499b8a888267a489790fc9f9d85
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon Apr 21 11:14:51 2014 -0700
xwayland: Remove left-over ErrorF logging
Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 844745a..b966e50 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);
commit d2c6e801b548674b8636e6a64b42c9038d46263c
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Tue Apr 8 09:23:42 2014 -0700
configure.ac: Remove check for WAYLAND_SCANNER_RULES
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 <daniel at fooishbar.org>
Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
diff --git a/configure.ac b/configure.ac
index bfe1fc9..4563dc7 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
commit f618455c802abb77de8d64eb442422cfe5e26ea8
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Tue Apr 8 09:19:13 2014 -0700
xwayland: Build without xshmfence
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 5cecefd..844745a 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);
commit 552d40b26a082df6f1816bb461793b8fa8b553c6
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Tue Apr 8 09:17:51 2014 -0700
xwayland: Build without GLX extension
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index c2c6481..5cecefd 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
More information about the xorg-commit
mailing list