diff --git a/Makefile b/Makefile
index d09f85afdc..28b77f081b 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,6 @@ else
ifeq ($(HAVE_GLES), 1)
LIBS += -lGLESv2 -lEGL
DEFINES += -DHAVE_OPENGLES -DHAVE_OPENGLES2
- OBJ += gfx/context/xegl_ctx.o
else
LIBS += -lGL
OBJ += gfx/context/sdl_ctx.o
@@ -159,6 +158,16 @@ endif
endif
endif
+ifeq ($(HAVE_KMS), 1)
+ OBJ += gfx/context/drm_egl_ctx.o
+ DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS)
+ LIBS += $(GBM_LIBS) $(DRM_LIBS)
+else
+ifeq ($(HAVE_GLES), 1)
+ OBJ += gfx/context/xegl_ctx.o
+endif
+endif
+
ifeq ($(HAVE_RPI), 1)
OBJ += gfx/rpi.o
LIBS += -lOpenVG -lGLESv2 -lEGL -lbcm_host -lvcos -lvchiq_arm
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
new file mode 100644
index 0000000000..f5b495bd9e
--- /dev/null
+++ b/gfx/context/drm_egl_ctx.c
@@ -0,0 +1,450 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2012 - Daniel De Matteis
+ *
+ * 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 .
+ */
+
+// KMS/DRM context, running without any window manager.
+// Based on kmscube example by Rob Clark.
+
+#include "../../driver.h"
+#include "../gfx_context.h"
+#include "../gl_common.h"
+#include "../gfx_common.h"
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static EGLContext g_egl_ctx;
+static EGLSurface g_egl_surf;
+static EGLDisplay g_egl_dpy;
+static EGLConfig g_config;
+
+static volatile sig_atomic_t g_quit;
+static bool g_inited;
+static unsigned g_interval;
+
+static struct gbm_device *g_gbm_dev;
+static struct gbm_surface *g_gbm_surface;
+
+static int g_drm_fd;
+static drmModeModeInfo *g_drm_mode;
+static uint32_t g_crtc_id;
+static uint32_t g_connector_id;
+
+static unsigned g_fb_width; // Just use something for now.
+static unsigned g_fb_height;
+
+static struct gbm_bo *g_bo;
+
+struct drm_fb
+{
+ struct gbm_bo *bo;
+ uint32_t fb_id;
+};
+
+static struct drm_fb *drm_fb_get_from_bo(struct gbm_bo *bo);
+
+static void sighandler(int sig)
+{
+ (void)sig;
+ g_quit = 1;
+}
+
+void gfx_ctx_set_swap_interval(unsigned interval, bool inited)
+{
+ g_interval = interval;
+}
+
+void gfx_ctx_check_window(bool *quit,
+ bool *resize, unsigned *width, unsigned *height, unsigned frame_count)
+{
+ (void)frame_count;
+ (void)width;
+ (void)height;
+
+ *resize = false;
+ *quit = g_quit;
+}
+
+static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec, void *data)
+{
+ (void)fd;
+ (void)frame;
+ (void)sec;
+ (void)usec;
+
+ int *waiting = (int*)data;
+ *waiting = 0;
+}
+
+void gfx_ctx_swap_buffers(void)
+{
+ eglSwapBuffers(g_egl_dpy, g_egl_surf);
+
+ struct gbm_bo *next_bo = gbm_surface_lock_front_buffer(g_gbm_surface);
+ struct drm_fb *fb = drm_fb_get_from_bo(next_bo);
+
+ int waiting_for_flip = 1;
+
+ int ret = drmModePageFlip(g_drm_fd, g_crtc_id, fb->fb_id,
+ DRM_MODE_PAGE_FLIP_EVENT, &waiting_for_flip);
+
+ if (ret < 0)
+ {
+ RARCH_ERR("[KMS/EGL]: Failed to queue page flip.\n");
+ return;
+ }
+
+ struct pollfd fds = {0};
+ fds.fd = g_drm_fd;
+ fds.events = POLLIN;
+
+ drmEventContext evctx = {0};
+ evctx.version = DRM_EVENT_CONTEXT_VERSION;
+ evctx.page_flip_handler = page_flip_handler;
+
+ while (waiting_for_flip)
+ {
+ fds.revents = 0;
+ if (poll(&fds, 1, -1) < 0)
+ break;
+
+ if (fds.revents & (POLLHUP | POLLERR))
+ break;
+
+ if (fds.revents & POLLIN)
+ drmHandleEvent(g_drm_fd, &evctx);
+ else
+ break;
+ }
+
+ gbm_surface_release_buffer(g_gbm_surface, g_bo);
+ g_bo = next_bo;
+}
+
+void gfx_ctx_set_resize(unsigned width, unsigned height)
+{
+ (void)width;
+ (void)height;
+}
+
+void gfx_ctx_update_window_title(bool reset)
+{
+ (void)reset;
+}
+
+void gfx_ctx_get_video_size(unsigned *width, unsigned *height)
+{
+ *width = g_fb_width;
+ *height = g_fb_height;
+}
+
+bool gfx_ctx_init(void)
+{
+ if (g_inited)
+ return false;
+
+ static const char *modules[] = {
+ "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", NULL
+ };
+
+ drmModeRes *resources = NULL;
+ drmModeConnector *connector = NULL;
+ drmModeEncoder *encoder = NULL;
+
+ for (int i = 0; modules[i]; i++)
+ {
+ RARCH_LOG("[KMS/EGL]: Trying to load module %s ...\n", modules[i]);
+ g_drm_fd = drmOpen(modules[i], NULL);
+ if (g_drm_fd >= 0)
+ {
+ RARCH_LOG("[KMS/EGL]: Found module %s.\n", modules[i]);
+ break;
+ }
+ }
+
+ if (g_drm_fd < 0)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't open DRM device.\n");
+ goto error;
+ }
+
+ resources = drmModeGetResources(g_drm_fd);
+ if (!resources)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't get device resources.\n");
+ goto error;
+ }
+
+ for (int i = 0; i < resources->count_connectors; i++)
+ {
+ connector = drmModeGetConnector(g_drm_fd, resources->connectors[i]);
+ if (connector->connection == DRM_MODE_CONNECTED)
+ break;
+
+ drmModeFreeConnector(connector);
+ connector = NULL;
+ }
+
+ if (!connector)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't get device connector.\n");
+ goto error;
+ }
+
+ for (int i = 0, area = 0; i < connector->count_modes; i++)
+ {
+ drmModeModeInfo *current_mode = &connector->modes[i];
+ int current_area = current_mode->hdisplay * current_mode->vdisplay;
+ if (current_area > area)
+ {
+ g_drm_mode = current_mode;
+ area = current_area;
+ }
+ }
+
+ if (!g_drm_mode)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't find DRM mode.\n");
+ goto error;
+ }
+
+ for (int i = 0; i < resources->count_encoders; i++)
+ {
+ encoder = drmModeGetEncoder(g_drm_fd, resources->encoders[i]);
+ if (encoder->encoder_id == connector->encoder_id)
+ break;
+
+ drmModeFreeEncoder(encoder);
+ encoder = NULL;
+ }
+
+ if (!encoder)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't find DRM encoder.\n");
+ goto error;
+ }
+
+ g_crtc_id = encoder->crtc_id;
+ g_connector_id = connector->connector_id;
+
+ g_fb_width = g_drm_mode->hdisplay;
+ g_fb_height = g_drm_mode->vdisplay;
+
+ g_gbm_dev = gbm_create_device(g_drm_fd);
+ g_gbm_surface = gbm_surface_create(g_gbm_dev,
+ g_fb_width, g_fb_height,
+ GBM_FORMAT_XRGB8888,
+ GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+
+ if (!g_gbm_surface)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't create GBM surface.\n");
+ goto error;
+ }
+
+ static const EGLint context_attribs[] = {
+ EGL_CONTEXT_CLIENT_VERSION, 2,
+ EGL_NONE
+ };
+
+ static const EGLint config_attribs[] = {
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+ EGL_RED_SIZE, 1,
+ EGL_GREEN_SIZE, 1,
+ EGL_BLUE_SIZE, 1,
+ EGL_ALPHA_SIZE, 0,
+ EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+ EGL_NONE
+ };
+
+ g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_gbm_dev);
+ if (!g_egl_dpy)
+ {
+ RARCH_ERR("[KMS/EGL]: Couldn't get EGL display.\n");
+ goto error;
+ }
+
+ EGLint major, minor;
+ if (!eglInitialize(g_egl_dpy, &major, &minor))
+ goto error;
+
+ if (!eglBindAPI(EGL_OPENGL_ES_API))
+ goto error;
+
+ EGLint n;
+ if (!eglChooseConfig(g_egl_dpy, config_attribs, &g_config, 1, &n) || n != 1)
+ goto error;
+
+ g_egl_ctx = eglCreateContext(g_egl_dpy, g_config, EGL_NO_CONTEXT, context_attribs);
+ if (!g_egl_ctx)
+ goto error;
+
+ g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_config, (EGLNativeWindowType)g_gbm_surface, NULL);
+ if (!g_egl_surf)
+ goto error;
+
+ if (!eglMakeCurrent(g_egl_dpy, g_egl_surf, g_egl_surf, g_egl_ctx))
+ goto error;
+
+ return true;
+
+error:
+ gfx_ctx_destroy();
+ return false;
+}
+
+static void drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
+{
+ struct drm_fb *fb = (struct drm_fb*)data;
+
+ if (fb->fb_id)
+ drmModeRmFB(g_drm_fd, fb->fb_id);
+
+ free(fb);
+}
+
+static struct drm_fb *drm_fb_get_from_bo(struct gbm_bo *bo)
+{
+ struct drm_fb *fb = (struct drm_fb*)gbm_bo_get_user_data(bo);
+ if (fb)
+ return fb;
+
+ fb = (struct drm_fb*)calloc(1, sizeof(*fb));
+ fb->bo = bo;
+
+ unsigned width = gbm_bo_get_width(bo);
+ unsigned height = gbm_bo_get_height(bo);
+ unsigned stride = gbm_bo_get_stride(bo);
+ unsigned handle = gbm_bo_get_handle(bo).u32;
+
+ int ret = drmModeAddFB(g_drm_fd, width, height, 24, 32, stride, handle, &fb->fb_id);
+ if (ret < 0)
+ {
+ RARCH_ERR("[KMS/EGL]: Failed to create FB: %s\n", strerror(errno));
+ free(fb);
+ return NULL;
+ }
+
+ gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback);
+ return fb;
+}
+
+bool gfx_ctx_set_video_mode(
+ unsigned width, unsigned height,
+ unsigned bits, bool fullscreen)
+{
+ (void)bits;
+ if (g_inited)
+ return false;
+
+ 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);
+
+ glClearColor(0.0, 0.0, 0.0, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ eglSwapBuffers(g_egl_dpy, g_egl_surf);
+
+ struct gbm_bo *bo = gbm_surface_lock_front_buffer(g_gbm_surface);
+ struct drm_fb *fb = drm_fb_get_from_bo(bo);
+
+ int ret = drmModeSetCrtc(g_drm_fd, g_crtc_id, fb->fb_id, 0, 0, &g_connector_id, 1, g_drm_mode);
+ if (ret < 0)
+ goto error;
+
+ g_inited = true;
+ return true;
+
+error:
+ gfx_ctx_destroy();
+ return false;
+}
+
+void gfx_ctx_destroy(void)
+{
+ 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_surf)
+ eglDestroySurface(g_egl_dpy, g_egl_surf);
+ eglTerminate(g_egl_dpy);
+ }
+
+ g_egl_ctx = NULL;
+ g_egl_surf = NULL;
+ g_egl_dpy = NULL;
+ g_config = 0;
+
+ drmClose(g_drm_fd);
+
+ g_inited = false;
+}
+
+void gfx_ctx_input_driver(const input_driver_t **input, void **input_data)
+{
+ void *linuxinput = input_linuxraw.init();
+ *input = linuxinput ? &input_linuxraw : NULL;
+ *input_data = linuxinput;
+}
+
+void gfx_ctx_set_projection(gl_t *gl, const struct gl_ortho *ortho, bool allow_rotate)
+{
+ // Calculate projection.
+ math_matrix proj;
+ matrix_ortho(&proj, ortho->left, ortho->right,
+ ortho->bottom, ortho->top, ortho->znear, ortho->zfar);
+
+ if (allow_rotate)
+ {
+ math_matrix rot;
+ matrix_rotate_z(&rot, M_PI * gl->rotation / 180.0f);
+ matrix_multiply(&proj, &rot, &proj);
+ }
+
+ gl->mvp = proj;
+}
+
+bool gfx_ctx_window_has_focus(void)
+{
+ return g_inited;
+}
+
+gfx_ctx_proc_t gfx_ctx_get_proc_address(const char *symbol)
+{
+ return eglGetProcAddress(symbol);
+}
+
diff --git a/gfx/context/xegl_ctx.c b/gfx/context/xegl_ctx.c
index 4cdf9d64d5..8825a85a5a 100644
--- a/gfx/context/xegl_ctx.c
+++ b/gfx/context/xegl_ctx.c
@@ -219,6 +219,7 @@ bool gfx_ctx_init(void)
return false;
const EGLint egl_attribs[] = {
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
@@ -298,7 +299,8 @@ bool gfx_ctx_set_video_mode(
CWBorderPixel | CWColormap | CWEventMask, &swa);
XSetWindowBackground(g_dpy, g_win, 0);
- eglBindAPI(EGL_OPENGL_ES2_BIT);
+ if (!eglBindAPI(EGL_OPENGL_ES_API))
+ goto error;
g_egl_ctx = eglCreateContext(g_egl_dpy, g_config, EGL_NO_CONTEXT, egl_ctx_attribs);
if (!g_egl_ctx)
diff --git a/gfx/gl.c b/gfx/gl.c
index d02927f035..391dfc80f8 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1252,18 +1252,17 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
return NULL;
}
- unsigned full_x = 0, full_y = 0;
- gfx_ctx_get_video_size(&full_x, &full_y);
- RARCH_LOG("Detecting resolution %ux%u.\n", full_x, full_y);
+ gfx_ctx_get_video_size(&gl->full_x, &gl->full_y);
+ RARCH_LOG("Detecting screen resolution %ux%u.\n", gl->full_x, gl->full_y);
gfx_ctx_set_swap_interval(video->vsync ? 1 : 0, false);
- unsigned win_width = video->width;
+ unsigned win_width = video->width;
unsigned win_height = video->height;
if (video->fullscreen && (win_width == 0) && (win_height == 0))
{
- win_width = full_x;
- win_height = full_y;
+ win_width = gl->full_x;
+ win_height = gl->full_y;
}
if (!gfx_ctx_set_video_mode(win_width, win_height,
@@ -1285,16 +1284,19 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
return NULL;
}
- gl->vsync = video->vsync;
+ gl->vsync = video->vsync;
gl->fullscreen = video->fullscreen;
- gl->full_x = full_x;
- gl->full_y = full_y;
- gl->win_width = win_width;
- gl->win_height = win_height;
-
+ // Get real known video size, which might have been altered by context.
+ gfx_ctx_get_video_size(&gl->win_width, &gl->win_height);
RARCH_LOG("GL: Using resolution %ux%u\n", gl->win_width, gl->win_height);
+ if (gl->full_x || gl->full_y) // We got bogus from gfx_ctx_get_video_size. Replace.
+ {
+ gl->full_x = gl->win_width;
+ gl->full_y = gl->win_height;
+ }
+
#if defined(HAVE_CG_MENU)
RARCH_LOG("Initializing menu shader ...\n");
gl_cg_set_menu_shader(default_paths.menu_shader_file);
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 03b6e05da2..709d98f6b3 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -128,6 +128,17 @@ fi
check_lib DYNAMIC "$DYLIB" dlopen
+if [ "$HAVE_KMS" = "yes" ]; then
+ check_pkgconf GBM gbm
+ check_pkgconf DRM libdrm
+
+ if [ "$HAVE_GBM" = "yes" ] && [ "$HAVE_DRM" = "yes" ]; then
+ HAVE_KMS=yes
+ HAVE_GLES=yes
+ fi
+fi
+check_lib GLES -lEGL eglCreateContext
+
check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11
check_pkgconf XEXT xext
@@ -145,6 +156,6 @@ check_pkgconf PYTHON python3
add_define_make OS "$OS"
# Creates config.mk and config.h.
-VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES DYLIB GETOPT_LONG THREADS CG XML SDL_IMAGE LIBPNG DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL CONFIGFILE FREETYPE XVIDEO X11 XEXT NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO PBO STRL 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 SINC FIXED_POINT BSV_MOVIE RPI"
+VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES KMS GBM DRM DYLIB GETOPT_LONG THREADS CG XML SDL_IMAGE LIBPNG DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL CONFIGFILE FREETYPE XVIDEO X11 XEXT NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO PBO STRL 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 SINC FIXED_POINT BSV_MOVIE RPI"
create_config_make config.mk $VARS
create_config_header config.h $VARS
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 25d1e05816..57fc0fd92c 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -7,6 +7,7 @@ HAVE_NETPLAY=auto # Enable netplay support
HAVE_CONFIGFILE=yes # Disable support for config file
HAVE_OPENGL=yes # Disable OpenGL support
HAVE_GLES=no # Use X/EGL instead of desktop GL (experimental)
+HAVE_KMS=no # Use KMS framebuffer EGL instead of desktop GL (experimental). Implies GLES.
HAVE_CG=auto # Enable Cg shader support
HAVE_XML=auto # Enable bSNES-style XML shader support
HAVE_FBO=auto # Enable render-to-texture (FBO) support
diff --git a/retroarch.c b/retroarch.c
index a3442b62ba..b51978c12f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1522,7 +1522,7 @@ static void init_command(void)
if (g_settings.stdin_cmd_enable && driver.stdin_claimed)
{
- RARCH_WARN("stdin command interface is desired, but input driver has already claimed stdin."
+ RARCH_WARN("stdin command interface is desired, but input driver has already claimed stdin.\n"
"Cannot use this command interface.\n");
}