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

Create x11_connect

Browse Source
This commit is contained in:
twinaphex 2015-11-19 11:07:52 +01:00
parent 95a5818ccb
commit f364ff0649
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/common/x11_common.c
View File

@ -503,3 +503,19 @@ void x11_install_sighandlers(void)
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL); sigaction(SIGTERM, &sa, NULL);
} }
bool x11_connect(void)
{
g_x11_quit = 0;
/* Keep one g_x11_dpy alive the entire process lifetime.
* This is necessary for nVidia's EGL implementation for now. */
if (!g_x11_dpy)
{
g_x11_dpy = XOpenDisplay(NULL);
if (!g_x11_dpy)
return false;
}
return true;
}

2
gfx/common/x11_common.h
View File

@ -79,5 +79,7 @@ bool x11_alive(void *data);
void x11_install_sighandlers(void); void x11_install_sighandlers(void);
bool x11_connect(void);
#endif #endif

7
gfx/drivers_context/glx_ctx.c
View File

@ -260,12 +260,7 @@ static bool gfx_ctx_glx_init(void *data)
XInitThreads(); XInitThreads();
g_x11_quit = 0; if (!x11_connect())
if (!g_x11_dpy)
g_x11_dpy = XOpenDisplay(NULL);
if (!g_x11_dpy)
goto error; goto error;
glXQueryVersion(g_x11_dpy, &major, &minor); glXQueryVersion(g_x11_dpy, &major, &minor);

12
gfx/drivers_context/xegl_ctx.c
View File

@ -215,16 +215,8 @@ static bool gfx_ctx_xegl_init(void *data)
attrib_ptr = NULL; attrib_ptr = NULL;
} }
g_x11_quit = 0; if (!x11_connect())
goto error;
/* Keep one g_x11_dpy alive the entire process lifetime.
* This is necessary for nVidia's EGL implementation for now. */
if (!g_x11_dpy)
{
g_x11_dpy = XOpenDisplay(NULL);
if (!g_x11_dpy)
goto error;
}
g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_x11_dpy); g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_x11_dpy);
if (g_egl_dpy == EGL_NO_DISPLAY) if (g_egl_dpy == EGL_NO_DISPLAY)