mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with nVidia EGL implementation.

Browse Source
This commit is contained in:
Themaister 2014-05-03 14:47:48 +02:00
parent 5678a7854f
commit f6a578ce4e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/context/xegl_ctx.c
View File

@ -148,31 +148,36 @@ static void gfx_ctx_check_window(void *data, bool *quit,
XEvent event; XEvent event;
while (XPending(g_dpy)) while (XPending(g_dpy))
{ {
// Can get events from older windows. Check this.
XNextEvent(g_dpy, &event); XNextEvent(g_dpy, &event);
bool filter = XFilterEvent(&event, g_win); bool filter = XFilterEvent(&event, g_win);
switch (event.type) switch (event.type)
{ {
case ClientMessage: case ClientMessage:
if ((Atom)event.xclient.data.l[0] == g_quit_atom) if (event.xclient.window == g_win && (Atom)event.xclient.data.l[0] == g_quit_atom)
g_quit = true; g_quit = true;
break; break;
case DestroyNotify: case DestroyNotify:
g_quit = true; if (event.xdestroywindow.window == g_win)
g_quit = true;
break; break;
case MapNotify: case MapNotify:
g_has_focus = true; if (event.xmap.window == g_win)
g_has_focus = true;
break; break;
case UnmapNotify: case UnmapNotify:
g_has_focus = false; if (event.xunmap.window == g_win)
g_has_focus = false;
break; break;
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
x11_handle_key_event(&event, g_xic, filter); if (event.xkey.window == g_win)
x11_handle_key_event(&event, g_xic, filter);
break; break;
} }
} }
@ -298,9 +303,14 @@ static bool gfx_ctx_init(void *data)
g_quit = 0; g_quit = 0;
g_dpy = XOpenDisplay(NULL); // Keep one g_dpy alive the entire process lifetime.
// This is necessary for nVidia's EGL implementation for now.
if (!g_dpy) if (!g_dpy)
goto error; {
g_dpy = XOpenDisplay(NULL);
if (!g_dpy)
goto error;
}
g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_dpy); g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_dpy);
if (g_egl_dpy == EGL_NO_DISPLAY) if (g_egl_dpy == EGL_NO_DISPLAY)
@ -629,12 +639,7 @@ static void gfx_ctx_destroy(void *data)
g_should_reset_mode = false; g_should_reset_mode = false;
} }
if (g_dpy) // Do not close g_dpy. We'll keep one for the entire application lifecycle to work-around nVidia EGL limitations.
{
XCloseDisplay(g_dpy);
g_dpy = NULL;
}
g_inited = false; g_inited = false;
} }