From 44b66962795e3bbf58363c3e512480333d09d43c Mon Sep 17 00:00:00 2001 From: Andreas Sinz Date: Sat, 14 Sep 2013 16:30:03 +0200 Subject: gl_common: add wayland backend before x11 backend --- video/out/gl_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 48b1089147..3830f237f8 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -858,11 +858,13 @@ static struct backend backends[] = { #ifdef CONFIG_GL_WIN32 {"win", mpgl_set_backend_w32}, #endif -#ifdef CONFIG_GL_X11 - {"x11", mpgl_set_backend_x11}, -#endif + +//Add the wayland backend before x11, in order to probe for a wayland-server before a x11-server and avoid using xwayland #ifdef CONFIG_GL_WAYLAND {"wayland", mpgl_set_backend_wayland}, +#endif +#ifdef CONFIG_GL_X11 + {"x11", mpgl_set_backend_x11}, #endif {0} }; -- cgit v1.2.3