diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-21 14:59:51 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-21 14:59:51 -0700 |
| commit | ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009 (patch) | |
| tree | 48cd4abaec86fbc99594cd7329dcb1c7a8d5fe97 | |
| parent | 9c86d5f4f6f5d6d135a9f2f8eae904c6441e84e5 (diff) | |
| parent | 66b602474047c499b8a888267a489790fc9f9d85 (diff) | |
Merge remote-tracking branch 'krh/xwayland-for-keithp'
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xwayland/xwayland.c | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 388e17c11..0c8b5162d 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 diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index c2c6481af..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); @@ -573,8 +572,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); @@ -616,8 +617,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 +642,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 |