mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(DRM) Uses its own sighandler and atomic quit variable

Browse Source
This commit is contained in:
twinaphex 2016-02-22 11:46:08 +01:00
parent 3bebc2284f
commit e4935d490c
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/drivers_context/drm_egl_ctx.c
View File

@ -60,6 +60,8 @@
#endif
static volatile sig_atomic_t drm_quit = 0;
static struct gbm_bo *g_bo;
static struct gbm_bo *g_next_bo;
static struct gbm_surface *g_gbm_surface;
@ -84,6 +86,24 @@ struct drm_fb
uint32_t fb_id;
};
static void drm_sighandler(int sig)
{
(void)sig;
drm_quit = 1;
}
static void drm_install_sighandler(void)
{
struct sigaction sa;
sa.sa_sigaction = NULL;
sa.sa_handler = drm_sighandler;
sa.sa_flags = SA_RESTART;
sigemptyset(&sa.sa_mask);
sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
}
static void drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
{
struct drm_fb *fb = (struct drm_fb*)data;
@ -145,7 +165,7 @@ static void gfx_ctx_drm_egl_check_window(void *data, bool *quit,
(void)height;
*resize = false;
*quit = g_egl_quit;
*quit = drm_quit;
}
@ -536,7 +556,7 @@ static bool gfx_ctx_drm_egl_set_video_mode(void *data,
if (!drm)
return false;
egl_install_sighandlers();
drm_install_sighandler();
switch (g_egl_api)
{

18
gfx/drivers_context/wayland_ctx.c
View File

@ -43,7 +43,7 @@
#include "../common/gl_common.h"
#endif
static volatile sig_atomic_t g_quit = 0;
static volatile sig_atomic_t wl_quit = 0;
typedef struct gfx_ctx_wayland_data
{
@ -80,18 +80,18 @@ static enum gfx_ctx_api wl_api;
#define EGL_OPENGL_ES3_BIT_KHR 0x0040
#endif
static void sighandler(int sig)
static void wl_sighandler(int sig)
{
(void)sig;
g_quit = 1;
wl_quit = 1;
}
static void install_sighandlers(void)
static void wl_install_sighandler(void)
{
struct sigaction sa;
sa.sa_sigaction = NULL;
sa.sa_handler = sighandler;
sa.sa_handler = wl_sighandler;
sa.sa_flags = SA_RESTART;
sigemptyset(&sa.sa_mask);
sigaction(SIGINT, &sa, NULL);
@ -319,7 +319,7 @@ static void flush_wayland_fd(gfx_ctx_wayland_data_t *wl)
if (fd.revents & (POLLERR | POLLHUP))
{
close(wl->fd);
g_quit = true;
wl_quit = true;
}
if (fd.revents & POLLIN)
@ -366,7 +366,7 @@ static void gfx_ctx_wl_check_window(void *data, bool *quit,
*height = new_height;
}
*quit = g_quit;
*quit = wl_quit;
}
static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height)
@ -553,7 +553,7 @@ static void *gfx_ctx_wl_init(void *video_driver)
}
#endif
g_quit = 0;
wl_quit = 0;
wl->dpy = wl_display_connect(NULL);
wl->buffer_scale = 1;
@ -564,7 +564,7 @@ static void *gfx_ctx_wl_init(void *video_driver)
goto error;
}
install_sighandlers();
wl_install_sighandler();
wl->registry = wl_display_get_registry(wl->dpy);
wl_registry_add_listener(wl->registry, &registry_listener, wl);