diff --git a/Makefile b/Makefile
index dc4cdbb1e2..101ac4ff14 100644
--- a/Makefile
+++ b/Makefile
@@ -264,6 +264,12 @@ ifeq ($(HAVE_OPENGL), 1)
LIBS += $(EGL_LIBS)
endif
endif
+
+ ifeq ($(HAVE_WAYLAND), 1)
+ ifeq ($(HAVE_EGL), 1)
+ OBJ += gfx/context/wayland_ctx.o
+ endif
+ endif
ifeq ($(HAVE_GLES), 1)
LIBS += $(GLES_LIBS)
@@ -286,6 +292,12 @@ ifeq ($(HAVE_OPENGL), 1)
DEFINES += -DHAVE_GLSL
endif
+ifeq ($(HAVE_WAYLAND), 1)
+ #OBJ += input/wayland.o
+ DEFINES += $(WAYLAND_CFLAGS)
+ LIBS += $(WAYLAND_LIBS)
+endif
+
ifeq ($(HAVE_VG), 1)
OBJ += gfx/vg.o gfx/math/matrix_3x3.o
DEFINES += $(VG_CFLAGS)
diff --git a/config.def.h b/config.def.h
index 5f90e1bf20..8443ea2cef 100644
--- a/config.def.h
+++ b/config.def.h
@@ -74,6 +74,7 @@ enum
INPUT_ANDROID,
INPUT_SDL,
INPUT_X,
+ INPUT_WAYLAND,
INPUT_DINPUT,
INPUT_PS3,
INPUT_PSP,
@@ -201,6 +202,8 @@ enum
#define INPUT_DEFAULT_DRIVER INPUT_LINUXRAW
#elif defined(HAVE_X11)
#define INPUT_DEFAULT_DRIVER INPUT_X
+#elif defined(HAVE_WAYLAND)
+#define INPUT_DEFAULT_DRIVER INPUT_WAYLAND
#elif defined(IOS) || defined(OSX)
#define INPUT_DEFAULT_DRIVER INPUT_APPLE
#elif defined(__QNX__)
diff --git a/config.features.h b/config.features.h
index c45672a37b..107bdac1d4 100644
--- a/config.features.h
+++ b/config.features.h
@@ -50,6 +50,18 @@ static const bool _egl_supp = true;
static const bool _egl_supp = false;
#endif
+#ifdef HAVE_X11
+static const bool _x11_supp = true;
+#else
+static const bool _x11_supp = false;
+#endif
+
+#ifdef HAVE_WAYLAND
+static const bool _wayland_supp = true;
+#else
+static const bool _wayland_supp = false;
+#endif
+
#ifdef HAVE_XVIDEO
static const bool _xvideo_supp = true;
#else
diff --git a/driver.h b/driver.h
index aabf9a9a25..fab6852719 100644
--- a/driver.h
+++ b/driver.h
@@ -628,6 +628,7 @@ extern const input_driver_t input_android;
extern const input_driver_t input_sdl;
extern const input_driver_t input_dinput;
extern const input_driver_t input_x;
+extern const input_driver_t input_wayland;
extern const input_driver_t input_ps3;
extern const input_driver_t input_psp;
extern const input_driver_t input_xenon360;
diff --git a/gfx/context/wayland_ctx.c b/gfx/context/wayland_ctx.c
new file mode 100644
index 0000000000..3f5ccc7141
--- /dev/null
+++ b/gfx/context/wayland_ctx.c
@@ -0,0 +1,626 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see .
+ */
+
+#include "../../driver.h"
+#include "../../general.h"
+#include "../gfx_common.h"
+#include "../gl_common.h"
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+static EGLContext g_egl_ctx;
+static EGLContext g_egl_hw_ctx;
+static EGLSurface g_egl_surf;
+static EGLDisplay g_egl_dpy;
+static EGLConfig g_config;
+static bool g_resize;
+static unsigned g_width, g_height;
+
+static struct wl_display *g_dpy;
+static struct wl_registry *g_registry;
+static struct wl_compositor *g_compositor;
+static struct wl_surface *g_surface;
+static struct wl_shell_surface *g_shell_surf;
+static struct wl_shell *g_shell;
+static struct wl_egl_window *g_win;
+static int g_fd;
+
+static unsigned g_interval;
+static enum gfx_ctx_api g_api;
+static unsigned g_major;
+static unsigned g_minor;
+static bool g_use_hw_ctx;
+
+static volatile sig_atomic_t g_quit;
+
+#ifndef EGL_OPENGL_ES3_BIT_KHR
+#define EGL_OPENGL_ES3_BIT_KHR 0x0040
+#endif
+
+static void sighandler(int sig)
+{
+ (void)sig;
+ g_quit = 1;
+}
+
+// Shell surface callbacks
+static void shell_surface_handle_ping(void *data, struct wl_shell_surface *shell_surface,
+ uint32_t serial)
+{
+ (void)data;
+ wl_shell_surface_pong(shell_surface, serial);
+}
+
+static void shell_surface_handle_configure(void *data, struct wl_shell_surface *shell_surface,
+ uint32_t edges, int32_t width, int32_t height)
+{
+ (void)data;
+ (void)shell_surface;
+ (void)edges;
+ g_width = width;
+ g_height = height;
+
+ RARCH_LOG("[Wayland/EGL]: Surface configure: %u x %u.\n", g_width, g_height);
+}
+
+static void shell_surface_handle_popup_done(void *data, struct wl_shell_surface *shell_surface)
+{
+ (void)data;
+ (void)shell_surface;
+}
+
+static const struct wl_shell_surface_listener shell_surface_listener = {
+ shell_surface_handle_ping,
+ shell_surface_handle_configure,
+ shell_surface_handle_popup_done,
+};
+
+// Registry callbacks
+static void registry_handle_global(void *data, struct wl_registry *reg, uint32_t id, const char *interface, uint32_t version)
+{
+ (void)data;
+ (void)version;
+
+ if (!strcmp(interface, "wl_compositor"))
+ g_compositor = wl_registry_bind(reg, id, &wl_compositor_interface, 1);
+ else if (!strcmp(interface, "wl_shell"))
+ g_shell = wl_registry_bind(reg, id, &wl_shell_interface, 1);
+}
+
+static void registry_handle_global_remove(void *data, struct wl_registry *registry,
+ uint32_t id)
+{
+ (void)data;
+ (void)registry;
+ (void)id;
+}
+
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ registry_handle_global_remove,
+};
+
+
+
+static void gfx_ctx_get_video_size(void *data, unsigned *width, unsigned *height);
+static void gfx_ctx_destroy(void *data);
+
+static void egl_report_error(void)
+{
+ EGLint error = eglGetError();
+ const char *str = NULL;
+ switch (error)
+ {
+ case EGL_SUCCESS:
+ str = "EGL_SUCCESS";
+ break;
+
+ case EGL_BAD_DISPLAY:
+ str = "EGL_BAD_DISPLAY";
+ break;
+
+ case EGL_BAD_SURFACE:
+ str = "EGL_BAD_SURFACE";
+ break;
+
+ case EGL_BAD_CONTEXT:
+ str = "EGL_BAD_CONTEXT";
+ break;
+
+ default:
+ str = "Unknown";
+ break;
+ }
+
+ RARCH_ERR("[Wayland/EGL]: #0x%x, %s\n", (unsigned)error, str);
+}
+
+static void gfx_ctx_swap_interval(void *data, unsigned interval)
+{
+ (void)data;
+ g_interval = interval;
+ if (g_egl_dpy && eglGetCurrentContext())
+ {
+ RARCH_LOG("[Wayland/EGL]: eglSwapInterval(%u)\n", g_interval);
+ if (!eglSwapInterval(g_egl_dpy, g_interval))
+ {
+ RARCH_ERR("[Wayland/EGL]: eglSwapInterval() failed.\n");
+ egl_report_error();
+ }
+ }
+}
+
+static void flush_wayland_fd(void)
+{
+ wl_display_dispatch_pending(g_dpy);
+ wl_display_flush(g_dpy);
+
+ struct pollfd fd = {0};
+ fd.fd = g_fd;
+ fd.events = POLLIN | POLLOUT | POLLERR | POLLHUP;
+
+ if (poll(&fd, 1, 0) > 0)
+ {
+ if (fd.revents & (POLLERR | POLLHUP))
+ {
+ close(g_fd);
+ g_quit = true;
+ }
+
+ if (fd.revents & POLLIN)
+ wl_display_dispatch(g_dpy);
+ if (fd.revents & POLLOUT)
+ wl_display_flush(g_dpy);
+ }
+}
+
+static void gfx_ctx_check_window(void *data, bool *quit,
+ bool *resize, unsigned *width, unsigned *height, unsigned frame_count)
+{
+ (void)frame_count;
+
+ flush_wayland_fd();
+
+ unsigned new_width = *width, new_height = *height;
+ gfx_ctx_get_video_size(data, &new_width, &new_height);
+
+ if (new_width != *width || new_height != *height)
+ {
+ *resize = true;
+ *width = new_width;
+ *height = new_height;
+ }
+
+ *quit = g_quit;
+}
+
+static void gfx_ctx_swap_buffers(void *data)
+{
+ (void)data;
+ eglSwapBuffers(g_egl_dpy, g_egl_surf);
+}
+
+static void gfx_ctx_set_resize(void *data, unsigned width, unsigned height)
+{
+ (void)data;
+ wl_egl_window_resize(g_win, width, height, 0, 0);
+}
+
+static void gfx_ctx_update_window_title(void *data)
+{
+ (void)data;
+ char buf[128], buf_fps[128];
+ bool fps_draw = g_settings.fps_show;
+ if (gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps)))
+ wl_shell_surface_set_title(g_shell_surf, buf);
+ if (fps_draw)
+ msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
+}
+
+static void gfx_ctx_get_video_size(void *data, unsigned *width, unsigned *height)
+{
+ (void)data;
+ *width = g_width;
+ *height = g_height;
+}
+
+#define DEFAULT_WINDOWED_WIDTH 640
+#define DEFAULT_WINDOWED_HEIGHT 480
+
+static bool gfx_ctx_init(void *data)
+{
+#define EGL_ATTRIBS_BASE \
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT, \
+ EGL_RED_SIZE, 1, \
+ EGL_GREEN_SIZE, 1, \
+ EGL_BLUE_SIZE, 1, \
+ EGL_ALPHA_SIZE, 0, \
+ EGL_DEPTH_SIZE, 0
+
+ static const EGLint egl_attribs_gl[] = {
+ EGL_ATTRIBS_BASE,
+ EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+ EGL_NONE,
+ };
+
+ static const EGLint egl_attribs_gles[] = {
+ EGL_ATTRIBS_BASE,
+ EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+ EGL_NONE,
+ };
+
+#ifdef EGL_KHR_create_context
+ static const EGLint egl_attribs_gles3[] = {
+ EGL_ATTRIBS_BASE,
+ EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT_KHR,
+ EGL_NONE,
+ };
+#endif
+
+ static const EGLint egl_attribs_vg[] = {
+ EGL_ATTRIBS_BASE,
+ EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT,
+ EGL_NONE,
+ };
+
+ const EGLint *attrib_ptr;
+ switch (g_api)
+ {
+ case GFX_CTX_OPENGL_API:
+ attrib_ptr = egl_attribs_gl;
+ break;
+ case GFX_CTX_OPENGL_ES_API:
+#ifdef EGL_KHR_create_context
+ if (g_major >= 3)
+ attrib_ptr = egl_attribs_gles3;
+ else
+#endif
+ attrib_ptr = egl_attribs_gles;
+ break;
+ case GFX_CTX_OPENVG_API:
+ attrib_ptr = egl_attribs_vg;
+ break;
+ default:
+ attrib_ptr = NULL;
+ }
+
+ g_quit = 0;
+
+ g_dpy = wl_display_connect(NULL);
+ if (!g_dpy)
+ {
+ RARCH_ERR("Failed to connect to Wayland server.\n");
+ goto error;
+ }
+
+ g_registry = wl_display_get_registry(g_dpy);
+ wl_registry_add_listener(g_registry, ®istry_listener, NULL);
+ wl_display_dispatch(g_dpy);
+
+ if (!g_compositor)
+ {
+ RARCH_ERR("Failed to create compositor.\n");
+ goto error;
+ }
+
+ if (!g_shell)
+ {
+ RARCH_ERR("Failed to create shell.\n");
+ goto error;
+ }
+
+ g_fd = wl_display_get_fd(g_dpy);
+
+ g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_dpy);
+ if (!g_egl_dpy)
+ {
+ RARCH_ERR("Failed to create EGL window.\n");
+ goto error;
+ }
+
+ EGLint egl_major = 0, egl_minor = 0;
+ if (!eglInitialize(g_egl_dpy, &egl_major, &egl_minor))
+ {
+ RARCH_ERR("Failed to initialize EGL.\n");
+ goto error;
+ }
+ RARCH_LOG("[Wayland/EGL]: EGL version: %d.%d\n", egl_major, egl_minor);
+
+ EGLint num_configs;
+ if (!eglChooseConfig(g_egl_dpy, attrib_ptr, &g_config, 1, &num_configs))
+ {
+ RARCH_ERR("[Wayland/EGL]: eglChooseConfig failed with 0x%x.\n", eglGetError());
+ goto error;
+ }
+
+ if (num_configs == 0 || !g_config)
+ {
+ RARCH_ERR("[Wayland/EGL]: No EGL configurations available.\n");
+ goto error;
+ }
+
+ return true;
+
+error:
+ gfx_ctx_destroy(data);
+ return false;
+}
+
+static EGLint *egl_fill_attribs(EGLint *attr)
+{
+ switch (g_api)
+ {
+#ifdef EGL_KHR_create_context
+ case GFX_CTX_OPENGL_API:
+ {
+ unsigned version = g_major * 1000 + g_minor;
+ bool core = version >= 3001;
+#ifdef GL_DEBUG
+ bool debug = true;
+#else
+ bool debug = g_extern.system.hw_render_callback.debug_context;
+#endif
+
+ if (core)
+ {
+ *attr++ = EGL_CONTEXT_MAJOR_VERSION_KHR;
+ *attr++ = g_major;
+ *attr++ = EGL_CONTEXT_MINOR_VERSION_KHR;
+ *attr++ = g_minor;
+ // Technically, we don't have core/compat until 3.2.
+ // Version 3.1 is either compat or not depending on GL_ARB_compatibility.
+ if (version >= 3002)
+ {
+ *attr++ = EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR;
+ *attr++ = EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR;
+ }
+ }
+
+ if (debug)
+ {
+ *attr++ = EGL_CONTEXT_FLAGS_KHR;
+ *attr++ = EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
+ }
+
+ break;
+ }
+#endif
+
+ case GFX_CTX_OPENGL_ES_API:
+ *attr++ = EGL_CONTEXT_CLIENT_VERSION; // Same as EGL_CONTEXT_MAJOR_VERSION
+ *attr++ = g_major ? (EGLint)g_major : 2;
+#ifdef EGL_KHR_create_context
+ if (g_minor > 0)
+ {
+ *attr++ = EGL_CONTEXT_MINOR_VERSION_KHR;
+ *attr++ = g_minor;
+ }
+#endif
+ break;
+
+ default:
+ break;
+ }
+
+ *attr = EGL_NONE;
+ return attr;
+}
+
+static bool gfx_ctx_set_video_mode(void *data,
+ unsigned width, unsigned height,
+ bool fullscreen)
+{
+ struct sigaction sa = {{0}};
+ sa.sa_handler = sighandler;
+ sa.sa_flags = SA_RESTART;
+ sigemptyset(&sa.sa_mask);
+ sigaction(SIGINT, &sa, NULL);
+ sigaction(SIGTERM, &sa, NULL);
+
+ EGLint egl_attribs[16];
+ EGLint *attr = egl_attribs;
+ attr = egl_fill_attribs(attr);
+
+ g_width = width ? width : DEFAULT_WINDOWED_WIDTH;
+ g_height = height ? height : DEFAULT_WINDOWED_HEIGHT;
+
+ g_surface = wl_compositor_create_surface(g_compositor);
+ g_win = wl_egl_window_create(g_surface, g_width, g_height);
+ g_shell_surf = wl_shell_get_shell_surface(g_shell, g_surface);
+
+ wl_shell_surface_add_listener(g_shell_surf, &shell_surface_listener, NULL);
+ wl_shell_surface_set_toplevel(g_shell_surf);
+ wl_shell_surface_set_class(g_shell_surf, "RetroArch");
+ wl_shell_surface_set_title(g_shell_surf, "RetroArch");
+
+ g_egl_ctx = eglCreateContext(g_egl_dpy, g_config, EGL_NO_CONTEXT,
+ attr != egl_attribs ? egl_attribs : NULL);
+
+ RARCH_LOG("[Wayland/EGL]: Created context: %p.\n", (void*)g_egl_ctx);
+ if (g_egl_ctx == EGL_NO_CONTEXT)
+ goto error;
+
+ if (g_use_hw_ctx)
+ {
+ g_egl_hw_ctx = eglCreateContext(g_egl_dpy, g_config, g_egl_ctx,
+ attr != egl_attribs ? egl_attribs : NULL);
+ RARCH_LOG("[Wayland/EGL]: Created shared context: %p.\n", (void*)g_egl_hw_ctx);
+
+ if (g_egl_hw_ctx == EGL_NO_CONTEXT)
+ goto error;
+ }
+
+ g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_config, (EGLNativeWindowType)g_win, NULL);
+ if (!g_egl_surf)
+ goto error;
+
+ if (!eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx))
+ goto error;
+
+ RARCH_LOG("[Wayland/EGL]: Current context: %p.\n", (void*)eglGetCurrentContext());
+
+ gfx_ctx_swap_interval(data, g_interval);
+
+ if (fullscreen)
+ wl_shell_surface_set_fullscreen(g_shell_surf, WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT, 0, NULL);
+
+ flush_wayland_fd();
+ return true;
+
+error:
+ gfx_ctx_destroy(data);
+ return false;
+}
+
+static void gfx_ctx_destroy(void *data)
+{
+ (void)data;
+
+ if (g_egl_dpy)
+ {
+ if (g_egl_ctx)
+ {
+ eglMakeCurrent(g_egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ eglDestroyContext(g_egl_dpy, g_egl_ctx);
+ }
+
+ if (g_egl_hw_ctx)
+ eglDestroyContext(g_egl_dpy, g_egl_hw_ctx);
+
+ if (g_egl_surf)
+ eglDestroySurface(g_egl_dpy, g_egl_surf);
+ eglTerminate(g_egl_dpy);
+ }
+
+ g_egl_ctx = NULL;
+ g_egl_hw_ctx = NULL;
+ g_egl_surf = NULL;
+ g_egl_dpy = NULL;
+ g_config = 0;
+
+ if (g_win)
+ wl_egl_window_destroy(g_win);
+ if (g_shell)
+ wl_shell_destroy(g_shell);
+ if (g_compositor)
+ wl_compositor_destroy(g_compositor);
+ if (g_registry)
+ wl_registry_destroy(g_registry);
+ if (g_shell_surf)
+ wl_shell_surface_destroy(g_shell_surf);
+ if (g_surface)
+ wl_surface_destroy(g_surface);
+
+ if (g_dpy)
+ {
+ wl_display_flush(g_dpy);
+ wl_display_disconnect(g_dpy);
+ }
+
+ g_win = NULL;
+ g_shell = NULL;
+ g_compositor = NULL;
+ g_registry = NULL;
+ g_dpy = NULL;
+ g_shell_surf = NULL;
+ g_surface = NULL;
+
+ g_width = g_height = 0;
+}
+
+static void gfx_ctx_input_driver(void *data, const input_driver_t **input, void **input_data)
+{
+ (void)data;
+ //void *wl = input_wayland.init();
+ //*input = wl ? &input_wayland : NULL;
+ //*input_data = wl;
+ *input = NULL;
+ *input_data = NULL;
+}
+
+static bool gfx_ctx_has_focus(void *data)
+{
+ (void)data;
+ return true;
+}
+
+static gfx_ctx_proc_t gfx_ctx_get_proc_address(const char *symbol)
+{
+ return eglGetProcAddress(symbol);
+}
+
+static bool gfx_ctx_bind_api(void *data, enum gfx_ctx_api api, unsigned major, unsigned minor)
+{
+ (void)data;
+ g_major = major;
+ g_minor = minor;
+ g_api = api;
+ switch (api)
+ {
+ case GFX_CTX_OPENGL_API:
+#ifndef EGL_KHR_create_context
+ if ((major * 1000 + minor) >= 3001)
+ return false;
+#endif
+ return eglBindAPI(EGL_OPENGL_API);
+ case GFX_CTX_OPENGL_ES_API:
+#ifndef EGL_KHR_create_context
+ if (major >= 3)
+ return false;
+#endif
+ return eglBindAPI(EGL_OPENGL_ES_API);
+ case GFX_CTX_OPENVG_API:
+ return eglBindAPI(EGL_OPENVG_API);
+ default:
+ return false;
+ }
+}
+
+static void gfx_ctx_bind_hw_render(void *data, bool enable)
+{
+ (void)data;
+ g_use_hw_ctx = enable;
+ if (g_egl_dpy && g_egl_surf)
+ eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, enable ? g_egl_hw_ctx : g_egl_ctx);
+}
+
+const gfx_ctx_driver_t gfx_ctx_wayland = {
+ gfx_ctx_init,
+ gfx_ctx_destroy,
+ gfx_ctx_bind_api,
+ gfx_ctx_swap_interval,
+ gfx_ctx_set_video_mode,
+ gfx_ctx_get_video_size,
+ NULL,
+ gfx_ctx_update_window_title,
+ gfx_ctx_check_window,
+ gfx_ctx_set_resize,
+ gfx_ctx_has_focus,
+ gfx_ctx_swap_buffers,
+ gfx_ctx_input_driver,
+ gfx_ctx_get_proc_address,
+ NULL,
+ NULL,
+ NULL,
+ "wayland",
+ gfx_ctx_bind_hw_render,
+};
diff --git a/gfx/gfx_context.c b/gfx/gfx_context.c
index bd26c30c1c..36d93848a3 100644
--- a/gfx/gfx_context.c
+++ b/gfx/gfx_context.c
@@ -41,6 +41,9 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(_WIN32) && defined(HAVE_OPENGL)
&gfx_ctx_wgl,
#endif
+#if defined(HAVE_WAYLAND) && defined(HAVE_OPENGL) && defined(HAVE_EGL)
+ &gfx_ctx_wayland,
+#endif
#if defined(HAVE_X11) && defined(HAVE_OPENGL) && !defined(HAVE_OPENGLES)
&gfx_ctx_glx,
#endif
diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h
index dae9495ad1..b8433c99eb 100644
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@@ -110,6 +110,7 @@ typedef struct gfx_ctx_driver
extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;
extern const gfx_ctx_driver_t gfx_ctx_x_egl;
+extern const gfx_ctx_driver_t gfx_ctx_wayland;
extern const gfx_ctx_driver_t gfx_ctx_glx;
extern const gfx_ctx_driver_t gfx_ctx_d3d9;
extern const gfx_ctx_driver_t gfx_ctx_drm_egl;
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 8d480e58d7..4de145f5d3 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -244,6 +244,8 @@ check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11
[ "$HAVE_X11" = "no" ] && HAVE_XEXT=no && HAVE_XF86VM=no && HAVE_XINERAMA=no
+check_pkgconf WAYLAND wayland-egl
+
check_pkgconf XKBCOMMON xkbcommon 0.3.2
check_pkgconf XEXT xext
check_pkgconf XF86VM xxf86vm
@@ -276,6 +278,6 @@ add_define_make OS "$OS"
# Creates config.mk and config.h.
add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
-VARS="RGUI LAKKA ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL OMAP GLES GLES3 VG EGL KMS EXYNOS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA MALI_FBDEV VIVANTE_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT"
+VARS="RGUI LAKKA ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL LIMA OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT"
create_config_make config.mk $VARS
create_config_header config.h $VARS
diff --git a/retroarch.c b/retroarch.c
index e49558513a..9613113038 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -823,6 +823,8 @@ static void print_features(void)
puts("");
puts("Features:");
_PSUPP(sdl, "SDL", "SDL drivers");
+ _PSUPP(x11, "X11", "X11 drivers");
+ _PSUPP(wayland, "wayland", "Wayland drivers");
_PSUPP(thread, "Threads", "Threading support");
_PSUPP(opengl, "OpenGL", "OpenGL driver");
_PSUPP(kms, "KMS", "KMS/EGL context support");
diff --git a/settings.c b/settings.c
index 12b4fe1a68..766e3e6911 100644
--- a/settings.c
+++ b/settings.c
@@ -144,6 +144,8 @@ const char *config_get_default_input(void)
return "dinput";
case INPUT_X:
return "x";
+ case INPUT_WAYLAND:
+ return "wayland";
case INPUT_XENON360:
return "xenon360";
case INPUT_XINPUT: