mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1264 from vanfanel/master

Browse Source 
Added fbdev res detection and term cursor blinking disabling to mali ctx
This commit is contained in:
Twinaphex 2015-01-03 21:00:38 +01:00
commit 510f88b343
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gfx/context/mali_fbdev_ctx.c
View File

@ -19,8 +19,17 @@
#include "../gl_common.h" #include "../gl_common.h"
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/fbdev_window.h>
#include <signal.h> #include <signal.h>
//Includes and defines for framebuffer size retrieval
#include <sys/ioctl.h>
#include <linux/fb.h>
#include <linux/vt.h>
#include <fcntl.h>
#include <unistd.h>
struct fbdev_window native_window;
static EGLContext g_egl_ctx; static EGLContext g_egl_ctx;
static EGLSurface g_egl_surf; static EGLSurface g_egl_surf;
static EGLDisplay g_egl_dpy; static EGLDisplay g_egl_dpy;
@ -69,6 +78,14 @@ static void gfx_ctx_mali_fbdev_destroy(void *data)
g_config = 0; g_config = 0;
g_quit = 0; g_quit = 0;
g_resize = false; g_resize = false;
//Clear framebuffer and set cursor on again
int fd = open("/dev/tty", O_RDWR);
ioctl(fd,VT_ACTIVATE,5);
ioctl(fd,VT_ACTIVATE,1);
close (fd);
system("setterm -cursor on");
} }
static void gfx_ctx_mali_fbdev_get_video_size(void *data, static void gfx_ctx_mali_fbdev_get_video_size(void *data,
@ -110,7 +127,11 @@ static bool gfx_ctx_mali_fbdev_init(void *data)
EGLint num_config; EGLint num_config;
EGLint egl_version_major, egl_version_minor; EGLint egl_version_major, egl_version_minor;
EGLint format; EGLint format;
//Disable cursor blinking so it's not visible in RetroArch
system("setterm -cursor off");
RARCH_LOG("[Mali fbdev]: Initializing context\n"); RARCH_LOG("[Mali fbdev]: Initializing context\n");
if ((g_egl_dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY)) == EGL_NO_DISPLAY) if ((g_egl_dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY)) == EGL_NO_DISPLAY)
@ -188,22 +209,30 @@ static bool gfx_ctx_mali_fbdev_set_video_mode(void *data,
unsigned width, unsigned height, unsigned width, unsigned height,
bool fullscreen) bool fullscreen)
{ {
/* Pick some arbitrary default. */ struct fb_var_screeninfo vinfo;
if (!width || !fullscreen) int fb = open("/dev/fb0", O_RDWR, 0);
width = 1280; if (ioctl(fb, FBIOGET_VSCREENINFO, &vinfo) < 0)
if (!height || !fullscreen) {
height = 720; RARCH_ERR("Error obtainig framebuffer info.\n");
goto error;
}
close (fb);
width = vinfo.xres;
height = vinfo.yres;
g_width = width; g_width = width;
g_height = height; g_height = height;
native_window.width = vinfo.xres;
native_window.height = vinfo.yres;
static const EGLint attribs[] = { static const EGLint attribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2, /* Use version 2, even for GLES3. */ EGL_CONTEXT_CLIENT_VERSION, 2, /* Use version 2, even for GLES3. */
EGL_NONE EGL_NONE
}; };
struct fbdev_window window = { width, height }; if ((g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_config, &native_window, 0)) == EGL_NO_SURFACE)
if ((g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_config, &window, 0)) == EGL_NO_SURFACE)
{ {
RARCH_ERR("eglCreateWindowSurface failed.\n"); RARCH_ERR("eglCreateWindowSurface failed.\n");
goto error; goto error;