Commit c3ae963a authored by Olivier Fourdan's avatar Olivier Fourdan Committed by Adam Jackson

xwayland: Fix build without glamor

Present support in Xwayland relies on glamor, make sure Xwayland can
be built without glamor by moving references to Present code inside
the conditional GLAMOR_HAS_GBM.
Reported-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarOlivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
Reviewed-by: Roman Gilg's avatarRoman Gilg <subdiff@gmail.com>
parent bf147f67
......@@ -11,7 +11,6 @@ Xwayland_CFLAGS = \
Xwayland_SOURCES = \
xwayland.c \
xwayland-present.c \
xwayland-input.c \
xwayland-cursor.c \
xwayland-shm.c \
......@@ -35,7 +34,8 @@ Xwayland_built_sources =
if GLAMOR_EGL
Xwayland_SOURCES += \
xwayland-glamor.c
xwayland-glamor.c \
xwayland-present.c
if XV
Xwayland_SOURCES += \
xwayland-glamor-xv.c
......
srcs = [
'xwayland.c',
'xwayland-present.c',
'xwayland-input.c',
'xwayland-cursor.c',
'xwayland-shm.c',
......@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml)
xwayland_glamor = []
if gbm_dep.found()
srcs += 'xwayland-glamor.c'
srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ]
if build_xv
srcs += 'xwayland-glamor-xv.c'
endif
......
......@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window)
wl_region_destroy(region);
}
#ifdef GLAMOR_HAS_GBM
if (xwl_screen->present) {
xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window);
xwl_window->present_msc = 1;
......@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window)
xorg_list_init(&xwl_window->present_event_list);
xorg_list_init(&xwl_window->present_release_queue);
}
#endif
wl_display_flush(xwl_screen->display);
......@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window)
compUnredirectWindow(serverClient, window, CompositeRedirectManual);
#ifdef GLAMOR_HAS_GBM
if (xwl_screen->present)
/* Always cleanup Present (Present might have been active on child window) */
xwl_present_cleanup(window);
#endif
screen->UnrealizeWindow = xwl_screen->UnrealizeWindow;
ret = (*screen->UnrealizeWindow) (window);
......@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window)
if (xwl_window->frame_callback)
wl_callback_destroy(xwl_window->frame_callback);
#ifdef GLAMOR_HAS_GBM
if (xwl_window->present_crtc_fake)
RRCrtcDestroy(xwl_window->present_crtc_fake);
#endif
free(xwl_window);
dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
......@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
xorg_list_for_each_entry_safe(xwl_window, next_xwl_window,
&xwl_screen->damage_window_list, link_damage) {
#ifdef GLAMOR_HAS_GBM
/* Present on the main surface. So don't commit here as well. */
if (xwl_window->present_window)
continue;
#endif
/* If we're waiting on a frame callback from the server,
* don't attach a new buffer. */
if (xwl_window->frame_callback)
......@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
ErrorF("Failed to initialize glamor, falling back to sw\n");
xwl_screen->glamor = 0;
}
#endif
if (xwl_screen->glamor && xwl_screen->rootless)
xwl_screen->present = xwl_present_init(pScreen);
#endif
if (!xwl_screen->glamor) {
xwl_screen->CreateScreenResources = pScreen->CreateScreenResources;
......
......@@ -127,7 +127,7 @@ struct xwl_window {
struct xorg_list link_damage;
struct wl_callback *frame_callback;
Bool allow_commits;
#ifdef GLAMOR_HAS_GBM
/* present */
RRCrtcPtr present_crtc_fake;
struct xorg_list present_link;
......@@ -143,8 +143,10 @@ struct xwl_window {
struct xorg_list present_event_list;
struct xorg_list present_release_queue;
#endif
};
#ifdef GLAMOR_HAS_GBM
struct xwl_present_event {
uint64_t event_id;
uint64_t target_msc;
......@@ -159,6 +161,7 @@ struct xwl_present_event {
struct xorg_list list;
};
#endif
#define MODIFIER_META 0x01
......@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap,
unsigned short height,
Bool *created);
#ifdef GLAMOR_HAS_GBM
Bool xwl_present_init(ScreenPtr screen);
void xwl_present_cleanup(WindowPtr window);
#endif
void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment