mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 21:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XEGL/GLX) Start using the same global state variables

Browse Source
This commit is contained in:
twinaphex 2015-11-19 10:00:25 +01:00
parent 3f23a23dea
commit 025db14dcf
4 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/common/x11_common.c
View File

@ -32,6 +32,9 @@ static Atom XA_NET_MOVERESIZE_WINDOW;
Atom g_x11_quit_atom; Atom g_x11_quit_atom;
volatile sig_atomic_t g_x11_quit; volatile sig_atomic_t g_x11_quit;
bool g_x11_has_focus; bool g_x11_has_focus;
Window g_x11_win;
XIC g_x11_xic;
Display *g_x11_dpy;
#define XA_INIT(x) XA##x = XInternAtom(dpy, #x, False) #define XA_INIT(x) XA##x = XInternAtom(dpy, #x, False)
#define _NET_WM_STATE_ADD 1 #define _NET_WM_STATE_ADD 1

3
gfx/common/x11_common.h
View File

@ -38,6 +38,9 @@
extern Atom g_x11_quit_atom; extern Atom g_x11_quit_atom;
extern volatile sig_atomic_t g_x11_quit; extern volatile sig_atomic_t g_x11_quit;
extern bool g_x11_has_focus; extern bool g_x11_has_focus;
extern Window g_x11_win;
extern XIC g_x11_xic;
extern Display *g_x11_dpy;
void x11_show_mouse(Display *dpy, Window win, bool state); void x11_show_mouse(Display *dpy, Window win, bool state);
void x11_windowed_fullscreen(Display *dpy, Window win); void x11_windowed_fullscreen(Display *dpy, Window win);

149
gfx/drivers_context/glx_ctx.c
View File

@ -40,8 +40,6 @@ typedef struct gfx_ctx_glx_data
bool g_should_reset_mode; bool g_should_reset_mode;
bool g_is_double; bool g_is_double;
Display *g_dpy;
Window g_win;
GLXWindow g_glx_win; GLXWindow g_glx_win;
Colormap g_cmap; Colormap g_cmap;
@ -49,7 +47,6 @@ typedef struct gfx_ctx_glx_data
unsigned g_interval; unsigned g_interval;
XIM g_xim; XIM g_xim;
XIC g_xic;
GLXContext g_ctx, g_hw_ctx; GLXContext g_ctx, g_hw_ctx;
GLXFBConfig g_fbc; GLXFBConfig g_fbc;
@ -79,7 +76,7 @@ static Bool glx_wait_notify(Display *d, XEvent *e, char *arg)
if (!glx) if (!glx)
return false; return false;
return (e->type == MapNotify) && (e->xmap.window == glx->g_win); return (e->type == MapNotify) && (e->xmap.window == g_x11_win);
} }
static int glx_nul_handler(Display *dpy, XErrorEvent *event) static int glx_nul_handler(Display *dpy, XErrorEvent *event)
@ -100,7 +97,7 @@ static void gfx_ctx_glx_get_video_size(void *data,
(void)data; (void)data;
if (!glx->g_dpy || glx->g_win == None) if (!g_x11_dpy || g_x11_win == None)
{ {
Display *dpy = (Display*)XOpenDisplay(NULL); Display *dpy = (Display*)XOpenDisplay(NULL);
*width = 0; *width = 0;
@ -117,7 +114,7 @@ static void gfx_ctx_glx_get_video_size(void *data,
else else
{ {
XWindowAttributes target; XWindowAttributes target;
XGetWindowAttributes(glx->g_dpy, glx->g_win, &target); XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
*width = target.width; *width = target.width;
*height = target.height; *height = target.height;
@ -131,27 +128,27 @@ static void ctx_glx_destroy_resources(gfx_ctx_glx_data_t *glx)
if (!glx) if (!glx)
return; return;
x11_destroy_input_context(&glx->g_xim, &glx->g_xic); x11_destroy_input_context(&glx->g_xim, &g_x11_xic);
if (glx->g_dpy && glx->g_ctx) if (g_x11_dpy && glx->g_ctx)
{ {
glFinish(); glFinish();
glXMakeContextCurrent(glx->g_dpy, None, None, NULL); glXMakeContextCurrent(g_x11_dpy, None, None, NULL);
if (!driver->video_cache_context) if (!driver->video_cache_context)
{ {
if (glx->g_hw_ctx) if (glx->g_hw_ctx)
glXDestroyContext(glx->g_dpy, glx->g_hw_ctx); glXDestroyContext(g_x11_dpy, glx->g_hw_ctx);
glXDestroyContext(glx->g_dpy, glx->g_ctx); glXDestroyContext(g_x11_dpy, glx->g_ctx);
glx->g_ctx = NULL; glx->g_ctx = NULL;
glx->g_hw_ctx = NULL; glx->g_hw_ctx = NULL;
} }
} }
if (glx->g_win) if (g_x11_win)
{ {
glXDestroyWindow(glx->g_dpy, glx->g_glx_win); glXDestroyWindow(g_x11_dpy, glx->g_glx_win);
glx->g_glx_win = 0; glx->g_glx_win = 0;
/* Save last used monitor for later. */ /* Save last used monitor for later. */
@ -161,38 +158,38 @@ static void ctx_glx_destroy_resources(gfx_ctx_glx_data_t *glx)
Window child; Window child;
int x = 0, y = 0; int x = 0, y = 0;
XGetWindowAttributes(glx->g_dpy, glx->g_win, &target); XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
XTranslateCoordinates(glx->g_dpy, glx->g_win, DefaultRootWindow(glx->g_dpy), XTranslateCoordinates(g_x11_dpy, g_x11_win, DefaultRootWindow(g_x11_dpy),
target.x, target.y, &x, &y, &child); target.x, target.y, &x, &y, &child);
glx->g_screen = x11_get_xinerama_monitor(glx->g_dpy, x, y, glx->g_screen = x11_get_xinerama_monitor(g_x11_dpy, x, y,
target.width, target.height); target.width, target.height);
RARCH_LOG("[GLX]: Saved monitor #%u.\n", glx->g_screen); RARCH_LOG("[GLX]: Saved monitor #%u.\n", glx->g_screen);
} }
#endif #endif
XUnmapWindow(glx->g_dpy, glx->g_win); XUnmapWindow(g_x11_dpy, g_x11_win);
XDestroyWindow(glx->g_dpy, glx->g_win); XDestroyWindow(g_x11_dpy, g_x11_win);
glx->g_win = None; g_x11_win = None;
} }
if (glx->g_cmap) if (glx->g_cmap)
{ {
XFreeColormap(glx->g_dpy, glx->g_cmap); XFreeColormap(g_x11_dpy, glx->g_cmap);
glx->g_cmap = None; glx->g_cmap = None;
} }
if (glx->g_should_reset_mode) if (glx->g_should_reset_mode)
{ {
x11_exit_fullscreen(glx->g_dpy, &glx->g_desktop_mode); x11_exit_fullscreen(g_x11_dpy, &glx->g_desktop_mode);
glx->g_should_reset_mode = false; glx->g_should_reset_mode = false;
} }
if (!driver->video_cache_context && glx->g_dpy) if (!driver->video_cache_context && g_x11_dpy)
{ {
XCloseDisplay(glx->g_dpy); XCloseDisplay(g_x11_dpy);
glx->g_dpy = NULL; g_x11_dpy = NULL;
} }
g_pglSwapInterval = NULL; g_pglSwapInterval = NULL;
@ -229,7 +226,7 @@ static void gfx_ctx_glx_swap_interval(void *data, unsigned interval)
if (g_pglSwapIntervalEXT) if (g_pglSwapIntervalEXT)
{ {
RARCH_LOG("[GLX]: glXSwapIntervalEXT(%u)\n", glx->g_interval); RARCH_LOG("[GLX]: glXSwapIntervalEXT(%u)\n", glx->g_interval);
g_pglSwapIntervalEXT(glx->g_dpy, glx->g_glx_win, glx->g_interval); g_pglSwapIntervalEXT(g_x11_dpy, glx->g_glx_win, glx->g_interval);
} }
else if (g_pglSwapInterval) else if (g_pglSwapInterval)
{ {
@ -266,32 +263,32 @@ static void gfx_ctx_glx_check_window(void *data, bool *quit,
*height = new_height; *height = new_height;
} }
while (XPending(glx->g_dpy)) while (XPending(g_x11_dpy))
{ {
bool filter; bool filter;
XNextEvent(glx->g_dpy, &event); XNextEvent(g_x11_dpy, &event);
filter = XFilterEvent(&event, glx->g_win); filter = XFilterEvent(&event, g_x11_win);
switch (event.type) switch (event.type)
{ {
case ClientMessage: case ClientMessage:
if (event.xclient.window == glx->g_win && if (event.xclient.window == g_x11_win &&
(Atom)event.xclient.data.l[0] == g_x11_quit_atom) (Atom)event.xclient.data.l[0] == g_x11_quit_atom)
g_x11_quit = true; g_x11_quit = true;
break; break;
case DestroyNotify: case DestroyNotify:
if (event.xdestroywindow.window == glx->g_win) if (event.xdestroywindow.window == g_x11_win)
g_x11_quit = true; g_x11_quit = true;
break; break;
case MapNotify: case MapNotify:
if (event.xmap.window == glx->g_win) if (event.xmap.window == g_x11_win)
g_x11_has_focus = true; g_x11_has_focus = true;
break; break;
case UnmapNotify: case UnmapNotify:
if (event.xunmap.window == glx->g_win) if (event.xunmap.window == g_x11_win)
g_x11_has_focus = false; g_x11_has_focus = false;
break; break;
case ButtonPress: case ButtonPress:
@ -301,7 +298,7 @@ static void gfx_ctx_glx_check_window(void *data, bool *quit,
break; break;
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
x11_handle_key_event(&event, glx->g_xic, filter); x11_handle_key_event(&event, g_x11_xic, filter);
break; break;
} }
} }
@ -316,7 +313,7 @@ static void gfx_ctx_glx_swap_buffers(void *data)
(void)data; (void)data;
if (glx->g_is_double) if (glx->g_is_double)
glXSwapBuffers(glx->g_dpy, glx->g_glx_win); glXSwapBuffers(g_x11_dpy, glx->g_glx_win);
} }
static void gfx_ctx_glx_set_resize(void *data, static void gfx_ctx_glx_set_resize(void *data,
@ -337,7 +334,7 @@ static void gfx_ctx_glx_update_window_title(void *data)
if (video_monitor_get_fps(buf, sizeof(buf), if (video_monitor_get_fps(buf, sizeof(buf),
buf_fps, sizeof(buf_fps))) buf_fps, sizeof(buf_fps)))
XStoreName(glx->g_dpy, glx->g_win, buf); XStoreName(g_x11_dpy, g_x11_win, buf);
if (settings->fps_show) if (settings->fps_show)
rarch_main_msg_queue_push(buf_fps, 1, 1, false); rarch_main_msg_queue_push(buf_fps, 1, 1, false);
} }
@ -371,13 +368,13 @@ static bool gfx_ctx_glx_init(void *data)
g_x11_quit = 0; g_x11_quit = 0;
if (!glx->g_dpy) if (!g_x11_dpy)
glx->g_dpy = XOpenDisplay(NULL); g_x11_dpy = XOpenDisplay(NULL);
if (!glx->g_dpy) if (!g_x11_dpy)
goto error; goto error;
glXQueryVersion(glx->g_dpy, &major, &minor); glXQueryVersion(g_x11_dpy, &major, &minor);
/* GLX 1.3+ minimum required. */ /* GLX 1.3+ minimum required. */
if ((major * 1000 + minor) < 1003) if ((major * 1000 + minor) < 1003)
@ -403,7 +400,7 @@ static bool gfx_ctx_glx_init(void *data)
if ((glx->g_core_es || glx->g_debug) && !glx_create_context_attribs) if ((glx->g_core_es || glx->g_debug) && !glx_create_context_attribs)
goto error; goto error;
fbcs = glXChooseFBConfig(glx->g_dpy, DefaultScreen(glx->g_dpy), fbcs = glXChooseFBConfig(g_x11_dpy, DefaultScreen(g_x11_dpy),
visual_attribs, &nelements); visual_attribs, &nelements);
if (!fbcs) if (!fbcs)
@ -458,19 +455,19 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
windowed_full = settings->video.windowed_fullscreen; windowed_full = settings->video.windowed_fullscreen;
true_full = false; true_full = false;
vi = glXGetVisualFromFBConfig(glx->g_dpy, glx->g_fbc); vi = glXGetVisualFromFBConfig(g_x11_dpy, glx->g_fbc);
if (!vi) if (!vi)
goto error; goto error;
swa.colormap = glx->g_cmap = XCreateColormap(glx->g_dpy, swa.colormap = glx->g_cmap = XCreateColormap(g_x11_dpy,
RootWindow(glx->g_dpy, vi->screen), vi->visual, AllocNone); RootWindow(g_x11_dpy, vi->screen), vi->visual, AllocNone);
swa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask | swa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask |
ButtonReleaseMask | ButtonPressMask; ButtonReleaseMask | ButtonPressMask;
swa.override_redirect = fullscreen ? True : False; swa.override_redirect = fullscreen ? True : False;
if (fullscreen && !windowed_full) if (fullscreen && !windowed_full)
{ {
if (x11_enter_fullscreen(glx->g_dpy, width, height, &glx->g_desktop_mode)) if (x11_enter_fullscreen(g_x11_dpy, width, height, &glx->g_desktop_mode))
{ {
glx->g_should_reset_mode = true; glx->g_should_reset_mode = true;
true_full = true; true_full = true;
@ -488,7 +485,7 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
unsigned new_width = width; unsigned new_width = width;
unsigned new_height = height; unsigned new_height = height;
if (x11_get_xinerama_coord(glx->g_dpy, glx->g_screen, if (x11_get_xinerama_coord(g_x11_dpy, glx->g_screen,
&x_off, &y_off, &new_width, &new_height)) &x_off, &y_off, &new_width, &new_height))
RARCH_LOG("[GLX]: Using Xinerama on screen #%u.\n", glx->g_screen); RARCH_LOG("[GLX]: Using Xinerama on screen #%u.\n", glx->g_screen);
else else
@ -505,45 +502,45 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
RARCH_LOG("[GLX]: X = %d, Y = %d, W = %u, H = %u.\n", RARCH_LOG("[GLX]: X = %d, Y = %d, W = %u, H = %u.\n",
x_off, y_off, width, height); x_off, y_off, width, height);
glx->g_win = XCreateWindow(glx->g_dpy, RootWindow(glx->g_dpy, vi->screen), g_x11_win = XCreateWindow(g_x11_dpy, RootWindow(g_x11_dpy, vi->screen),
x_off, y_off, width, height, 0, x_off, y_off, width, height, 0,
vi->depth, InputOutput, vi->visual, vi->depth, InputOutput, vi->visual,
CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa); CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa);
XSetWindowBackground(glx->g_dpy, glx->g_win, 0); XSetWindowBackground(g_x11_dpy, g_x11_win, 0);
glx->g_glx_win = glXCreateWindow(glx->g_dpy, glx->g_fbc, glx->g_win, 0); glx->g_glx_win = glXCreateWindow(g_x11_dpy, glx->g_fbc, g_x11_win, 0);
x11_set_window_attr(glx->g_dpy, glx->g_win); x11_set_window_attr(g_x11_dpy, g_x11_win);
if (fullscreen) if (fullscreen)
x11_show_mouse(glx->g_dpy, glx->g_win, false); x11_show_mouse(g_x11_dpy, g_x11_win, false);
if (true_full) if (true_full)
{ {
RARCH_LOG("[GLX]: Using true fullscreen.\n"); RARCH_LOG("[GLX]: Using true fullscreen.\n");
XMapRaised(glx->g_dpy, glx->g_win); XMapRaised(g_x11_dpy, g_x11_win);
} }
else if (fullscreen) /* We attempted true fullscreen, but failed. Attempt using windowed fullscreen. */ else if (fullscreen) /* We attempted true fullscreen, but failed. Attempt using windowed fullscreen. */
{ {
XMapRaised(glx->g_dpy, glx->g_win); XMapRaised(g_x11_dpy, g_x11_win);
RARCH_LOG("[GLX]: Using windowed fullscreen.\n"); RARCH_LOG("[GLX]: Using windowed fullscreen.\n");
/* We have to move the window to the screen we want to go fullscreen on first. /* We have to move the window to the screen we want to go fullscreen on first.
* x_off and y_off usually get ignored in XCreateWindow(). * x_off and y_off usually get ignored in XCreateWindow().
*/ */
x11_move_window(glx->g_dpy, glx->g_win, x_off, y_off, width, height); x11_move_window(g_x11_dpy, g_x11_win, x_off, y_off, width, height);
x11_windowed_fullscreen(glx->g_dpy, glx->g_win); x11_windowed_fullscreen(g_x11_dpy, g_x11_win);
} }
else else
{ {
XMapWindow(glx->g_dpy, glx->g_win); XMapWindow(g_x11_dpy, g_x11_win);
/* If we want to map the window on a different screen, we'll have to do it by force. /* If we want to map the window on a different screen, we'll have to do it by force.
* Otherwise, we should try to let the window manager sort it out. * Otherwise, we should try to let the window manager sort it out.
* x_off and y_off usually get ignored in XCreateWindow(). */ * x_off and y_off usually get ignored in XCreateWindow(). */
if (glx->g_screen) if (glx->g_screen)
x11_move_window(glx->g_dpy, glx->g_win, x_off, y_off, width, height); x11_move_window(g_x11_dpy, g_x11_win, x_off, y_off, width, height);
} }
XIfEvent(glx->g_dpy, &event, glx_wait_notify, NULL); XIfEvent(g_x11_dpy, &event, glx_wait_notify, NULL);
if (!glx->g_ctx) if (!glx->g_ctx)
{ {
@ -580,21 +577,21 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
} }
*aptr = None; *aptr = None;
glx->g_ctx = glx_create_context_attribs(glx->g_dpy, glx->g_fbc, NULL, True, attribs); glx->g_ctx = glx_create_context_attribs(g_x11_dpy, glx->g_fbc, NULL, True, attribs);
if (glx->g_use_hw_ctx) if (glx->g_use_hw_ctx)
{ {
RARCH_LOG("[GLX]: Creating shared HW context.\n"); RARCH_LOG("[GLX]: Creating shared HW context.\n");
glx->g_hw_ctx = glx_create_context_attribs(glx->g_dpy, glx->g_fbc, glx->g_ctx, True, attribs); glx->g_hw_ctx = glx_create_context_attribs(g_x11_dpy, glx->g_fbc, glx->g_ctx, True, attribs);
if (!glx->g_hw_ctx) if (!glx->g_hw_ctx)
RARCH_ERR("[GLX]: Failed to create new shared context.\n"); RARCH_ERR("[GLX]: Failed to create new shared context.\n");
} }
} }
else else
{ {
glx->g_ctx = glXCreateNewContext(glx->g_dpy, glx->g_fbc, GLX_RGBA_TYPE, 0, True); glx->g_ctx = glXCreateNewContext(g_x11_dpy, glx->g_fbc, GLX_RGBA_TYPE, 0, True);
if (glx->g_use_hw_ctx) if (glx->g_use_hw_ctx)
{ {
glx->g_hw_ctx = glXCreateNewContext(glx->g_dpy, glx->g_fbc, GLX_RGBA_TYPE, glx->g_ctx, True); glx->g_hw_ctx = glXCreateNewContext(g_x11_dpy, glx->g_fbc, GLX_RGBA_TYPE, glx->g_ctx, True);
if (!glx->g_hw_ctx) if (!glx->g_hw_ctx)
RARCH_ERR("[GLX]: Failed to create new shared context.\n"); RARCH_ERR("[GLX]: Failed to create new shared context.\n");
} }
@ -612,14 +609,14 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
RARCH_LOG("[GLX]: Using cached GL context.\n"); RARCH_LOG("[GLX]: Using cached GL context.\n");
} }
glXMakeContextCurrent(glx->g_dpy, glx->g_glx_win, glx->g_glx_win, glx->g_ctx); glXMakeContextCurrent(g_x11_dpy, glx->g_glx_win, glx->g_glx_win, glx->g_ctx);
XSync(glx->g_dpy, False); XSync(g_x11_dpy, False);
g_x11_quit_atom = XInternAtom(glx->g_dpy, "WM_DELETE_WINDOW", False); g_x11_quit_atom = XInternAtom(g_x11_dpy, "WM_DELETE_WINDOW", False);
if (g_x11_quit_atom) if (g_x11_quit_atom)
XSetWMProtocols(glx->g_dpy, glx->g_win, &g_x11_quit_atom, 1); XSetWMProtocols(g_x11_dpy, g_x11_win, &g_x11_quit_atom, 1);
glXGetConfig(glx->g_dpy, vi, GLX_DOUBLEBUFFER, &val); glXGetConfig(g_x11_dpy, vi, GLX_DOUBLEBUFFER, &val);
glx->g_is_double = val; glx->g_is_double = val;
if (glx->g_is_double) if (glx->g_is_double)
@ -649,19 +646,19 @@ static bool gfx_ctx_glx_set_video_mode(void *data,
/* This can blow up on some drivers. It's not fatal, so override errors for this call. */ /* This can blow up on some drivers. It's not fatal, so override errors for this call. */
old_handler = XSetErrorHandler(glx_nul_handler); old_handler = XSetErrorHandler(glx_nul_handler);
XSetInputFocus(glx->g_dpy, glx->g_win, RevertToNone, CurrentTime); XSetInputFocus(g_x11_dpy, g_x11_win, RevertToNone, CurrentTime);
XSync(glx->g_dpy, False); XSync(g_x11_dpy, False);
XSetErrorHandler(old_handler); XSetErrorHandler(old_handler);
XFree(vi); XFree(vi);
g_x11_has_focus = true; g_x11_has_focus = true;
if (!x11_create_input_context(glx->g_dpy, glx->g_win, &glx->g_xim, &glx->g_xic)) if (!x11_create_input_context(g_x11_dpy, g_x11_win, &glx->g_xim, &g_x11_xic))
goto error; goto error;
driver->display_type = RARCH_DISPLAY_X11; driver->display_type = RARCH_DISPLAY_X11;
driver->video_display = (uintptr_t)glx->g_dpy; driver->video_display = (uintptr_t)g_x11_dpy;
driver->video_window = (uintptr_t)glx->g_win; driver->video_window = (uintptr_t)g_x11_win;
glx->g_true_full = true_full; glx->g_true_full = true_full;
return true; return true;
@ -699,9 +696,9 @@ static bool gfx_ctx_glx_has_focus(void *data)
(void)data; (void)data;
XGetInputFocus(glx->g_dpy, &win, &rev); XGetInputFocus(g_x11_dpy, &win, &rev);
return (win == glx->g_win && g_x11_has_focus) || glx->g_true_full; return (win == g_x11_win && g_x11_has_focus) || glx->g_true_full;
} }
static bool gfx_ctx_glx_suppress_screensaver(void *data, bool enable) static bool gfx_ctx_glx_suppress_screensaver(void *data, bool enable)
@ -758,7 +755,7 @@ static void gfx_ctx_glx_show_mouse(void *data, bool state)
(void)data; (void)data;
x11_show_mouse(glx->g_dpy, glx->g_win, state); x11_show_mouse(g_x11_dpy, g_x11_win, state);
} }
static void gfx_ctx_glx_bind_hw_render(void *data, bool enable) static void gfx_ctx_glx_bind_hw_render(void *data, bool enable)
@ -773,12 +770,12 @@ static void gfx_ctx_glx_bind_hw_render(void *data, bool enable)
glx->g_use_hw_ctx = enable; glx->g_use_hw_ctx = enable;
if (!glx->g_dpy) if (!g_x11_dpy)
return; return;
if (!glx->g_glx_win) if (!glx->g_glx_win)
return; return;
glXMakeContextCurrent(glx->g_dpy, glx->g_glx_win, glXMakeContextCurrent(g_x11_dpy, glx->g_glx_win,
glx->g_glx_win, enable ? glx->g_hw_ctx : glx->g_ctx); glx->g_glx_win, enable ? glx->g_hw_ctx : glx->g_ctx);
} }

113
gfx/drivers_context/xegl_ctx.c
View File

@ -34,14 +34,11 @@
#define EGL_OPENGL_ES3_BIT_KHR 0x0040 #define EGL_OPENGL_ES3_BIT_KHR 0x0040
#endif #endif
static Display *g_dpy;
static Window g_win;
static Colormap g_cmap; static Colormap g_cmap;
static bool g_true_full; static bool g_true_full;
static unsigned g_screen; static unsigned g_screen;
static XIM g_xim; static XIM g_xim;
static XIC g_xic;
static bool g_use_hw_ctx; static bool g_use_hw_ctx;
static EGLContext g_egl_hw_ctx; static EGLContext g_egl_hw_ctx;
@ -69,7 +66,7 @@ static Bool egl_wait_notify(Display *d, XEvent *e, char *arg)
{ {
(void)d; (void)d;
(void)e; (void)e;
return e->type == MapNotify && e->xmap.window == g_win; return e->type == MapNotify && e->xmap.window == g_x11_win;
} }
static int egl_nul_handler(Display *dpy, XErrorEvent *event) static int egl_nul_handler(Display *dpy, XErrorEvent *event)
@ -153,33 +150,33 @@ static void gfx_ctx_xegl_check_window(void *data, bool *quit,
*height = new_height; *height = new_height;
} }
while (XPending(g_dpy)) while (XPending(g_x11_dpy))
{ {
bool filter; bool filter;
/* Can get events from older windows. Check this. */ /* Can get events from older windows. Check this. */
XNextEvent(g_dpy, &event); XNextEvent(g_x11_dpy, &event);
filter = XFilterEvent(&event, g_win); filter = XFilterEvent(&event, g_x11_win);
switch (event.type) switch (event.type)
{ {
case ClientMessage: case ClientMessage:
if (event.xclient.window == g_win && (Atom)event.xclient.data.l[0] == g_x11_quit_atom) if (event.xclient.window == g_x11_win && (Atom)event.xclient.data.l[0] == g_x11_quit_atom)
g_x11_quit = true; g_x11_quit = true;
break; break;
case DestroyNotify: case DestroyNotify:
if (event.xdestroywindow.window == g_win) if (event.xdestroywindow.window == g_x11_win)
g_x11_quit = true; g_x11_quit = true;
break; break;
case MapNotify: case MapNotify:
if (event.xmap.window == g_win) if (event.xmap.window == g_x11_win)
g_x11_has_focus = true; g_x11_has_focus = true;
break; break;
case UnmapNotify: case UnmapNotify:
if (event.xunmap.window == g_win) if (event.xunmap.window == g_x11_win)
g_x11_has_focus = false; g_x11_has_focus = false;
break; break;
@ -192,8 +189,8 @@ static void gfx_ctx_xegl_check_window(void *data, bool *quit,
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
if (event.xkey.window == g_win) if (event.xkey.window == g_x11_win)
x11_handle_key_event(&event, g_xic, filter); x11_handle_key_event(&event, g_x11_xic, filter);
break; break;
} }
} }
@ -225,7 +222,7 @@ static void gfx_ctx_xegl_update_window_title(void *data)
if (video_monitor_get_fps(buf, sizeof(buf), if (video_monitor_get_fps(buf, sizeof(buf),
buf_fps, sizeof(buf_fps))) buf_fps, sizeof(buf_fps)))
XStoreName(g_dpy, g_win, buf); XStoreName(g_x11_dpy, g_x11_win, buf);
if (settings->fps_show) if (settings->fps_show)
rarch_main_msg_queue_push(buf_fps, 1, 1, false); rarch_main_msg_queue_push(buf_fps, 1, 1, false);
} }
@ -235,7 +232,7 @@ static void gfx_ctx_xegl_get_video_size(void *data,
{ {
(void)data; (void)data;
if (!g_dpy || g_win == None) if (!g_x11_dpy || g_x11_win == None)
{ {
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);
if (dpy) if (dpy)
@ -254,7 +251,7 @@ static void gfx_ctx_xegl_get_video_size(void *data,
else else
{ {
XWindowAttributes target; XWindowAttributes target;
XGetWindowAttributes(g_dpy, g_win, &target); XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
*width = target.width; *width = target.width;
*height = target.height; *height = target.height;
@ -329,16 +326,16 @@ static bool gfx_ctx_xegl_init(void *data)
g_x11_quit = 0; g_x11_quit = 0;
/* Keep one g_dpy alive the entire process lifetime. /* Keep one g_x11_dpy alive the entire process lifetime.
* This is necessary for nVidia's EGL implementation for now. */ * This is necessary for nVidia's EGL implementation for now. */
if (!g_dpy) if (!g_x11_dpy)
{ {
g_dpy = XOpenDisplay(NULL); g_x11_dpy = XOpenDisplay(NULL);
if (!g_dpy) if (!g_x11_dpy)
goto error; goto error;
} }
g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_dpy); g_egl_dpy = eglGetDisplay((EGLNativeDisplayType)g_x11_dpy);
if (g_egl_dpy == EGL_NO_DISPLAY) if (g_egl_dpy == EGL_NO_DISPLAY)
{ {
RARCH_ERR("[X/EGL]: EGL display not available.\n"); RARCH_ERR("[X/EGL]: EGL display not available.\n");
@ -478,18 +475,18 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
temp.visualid = vid; temp.visualid = vid;
vi = XGetVisualInfo(g_dpy, VisualIDMask, &temp, &num_visuals); vi = XGetVisualInfo(g_x11_dpy, VisualIDMask, &temp, &num_visuals);
if (!vi) if (!vi)
goto error; goto error;
swa.colormap = g_cmap = XCreateColormap(g_dpy, RootWindow(g_dpy, vi->screen), swa.colormap = g_cmap = XCreateColormap(g_x11_dpy, RootWindow(g_x11_dpy, vi->screen),
vi->visual, AllocNone); vi->visual, AllocNone);
swa.event_mask = StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | KeyReleaseMask; swa.event_mask = StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | KeyReleaseMask;
swa.override_redirect = fullscreen ? True : False; swa.override_redirect = fullscreen ? True : False;
if (fullscreen && !windowed_full) if (fullscreen && !windowed_full)
{ {
if (x11_enter_fullscreen(g_dpy, width, height, &g_desktop_mode)) if (x11_enter_fullscreen(g_x11_dpy, width, height, &g_desktop_mode))
{ {
g_should_reset_mode = true; g_should_reset_mode = true;
true_full = true; true_full = true;
@ -507,7 +504,7 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
unsigned new_width = width; unsigned new_width = width;
unsigned new_height = height; unsigned new_height = height;
if (x11_get_xinerama_coord(g_dpy, g_screen, &x_off, &y_off, &new_width, &new_height)) if (x11_get_xinerama_coord(g_x11_dpy, g_screen, &x_off, &y_off, &new_width, &new_height))
RARCH_LOG("[X/EGL]: Using Xinerama on screen #%u.\n", g_screen); RARCH_LOG("[X/EGL]: Using Xinerama on screen #%u.\n", g_screen);
else else
RARCH_LOG("[X/EGL]: Xinerama is not active on screen.\n"); RARCH_LOG("[X/EGL]: Xinerama is not active on screen.\n");
@ -523,11 +520,11 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
RARCH_LOG("[X/EGL]: X = %d, Y = %d, W = %u, H = %u.\n", RARCH_LOG("[X/EGL]: X = %d, Y = %d, W = %u, H = %u.\n",
x_off, y_off, width, height); x_off, y_off, width, height);
g_win = XCreateWindow(g_dpy, RootWindow(g_dpy, vi->screen), g_x11_win = XCreateWindow(g_x11_dpy, RootWindow(g_x11_dpy, vi->screen),
x_off, y_off, width, height, 0, x_off, y_off, width, height, 0,
vi->depth, InputOutput, vi->visual, vi->depth, InputOutput, vi->visual,
CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa); CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa);
XSetWindowBackground(g_dpy, g_win, 0); XSetWindowBackground(g_x11_dpy, g_x11_win, 0);
g_egl_ctx = eglCreateContext(g_egl_dpy, g_egl_config, EGL_NO_CONTEXT, g_egl_ctx = eglCreateContext(g_egl_dpy, g_egl_config, EGL_NO_CONTEXT,
attr != egl_attribs ? egl_attribs : NULL); attr != egl_attribs ? egl_attribs : NULL);
@ -547,7 +544,7 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
goto error; goto error;
} }
g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_egl_config, (EGLNativeWindowType)g_win, NULL); g_egl_surf = eglCreateWindowSurface(g_egl_dpy, g_egl_config, (EGLNativeWindowType)g_x11_win, NULL);
if (!g_egl_surf) if (!g_egl_surf)
goto error; goto error;
@ -556,33 +553,33 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
RARCH_LOG("[X/EGL]: Current context: %p.\n", (void*)eglGetCurrentContext()); RARCH_LOG("[X/EGL]: Current context: %p.\n", (void*)eglGetCurrentContext());
x11_set_window_attr(g_dpy, g_win); x11_set_window_attr(g_x11_dpy, g_x11_win);
if (fullscreen) if (fullscreen)
x11_show_mouse(g_dpy, g_win, false); x11_show_mouse(g_x11_dpy, g_x11_win, false);
if (true_full) if (true_full)
{ {
RARCH_LOG("[X/EGL]: Using true fullscreen.\n"); RARCH_LOG("[X/EGL]: Using true fullscreen.\n");
XMapRaised(g_dpy, g_win); XMapRaised(g_x11_dpy, g_x11_win);
} }
else if (fullscreen) else if (fullscreen)
{ {
/* We attempted true fullscreen, but failed. /* We attempted true fullscreen, but failed.
* Attempt using windowed fullscreen. */ * Attempt using windowed fullscreen. */
XMapRaised(g_dpy, g_win); XMapRaised(g_x11_dpy, g_x11_win);
RARCH_LOG("[X/EGL]: Using windowed fullscreen.\n"); RARCH_LOG("[X/EGL]: Using windowed fullscreen.\n");
/* We have to move the window to the screen we /* We have to move the window to the screen we
* want to go fullscreen on first. * want to go fullscreen on first.
* x_off and y_off usually get ignored in XCreateWindow(). * x_off and y_off usually get ignored in XCreateWindow().
*/ */
x11_move_window(g_dpy, g_win, x_off, y_off, width, height); x11_move_window(g_x11_dpy, g_x11_win, x_off, y_off, width, height);
x11_windowed_fullscreen(g_dpy, g_win); x11_windowed_fullscreen(g_x11_dpy, g_x11_win);
} }
else else
{ {
XMapWindow(g_dpy, g_win); XMapWindow(g_x11_dpy, g_x11_win);
/* If we want to map the window on a different screen, /* If we want to map the window on a different screen,
* we'll have to do it by force. * we'll have to do it by force.
@ -591,14 +588,14 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
* x_off and y_off usually get ignored in XCreateWindow(). * x_off and y_off usually get ignored in XCreateWindow().
*/ */
if (g_screen) if (g_screen)
x11_move_window(g_dpy, g_win, x_off, y_off, width, height); x11_move_window(g_x11_dpy, g_x11_win, x_off, y_off, width, height);
} }
XIfEvent(g_dpy, &event, egl_wait_notify, NULL); XIfEvent(g_x11_dpy, &event, egl_wait_notify, NULL);
g_x11_quit_atom = XInternAtom(g_dpy, "WM_DELETE_WINDOW", False); g_x11_quit_atom = XInternAtom(g_x11_dpy, "WM_DELETE_WINDOW", False);
if (g_x11_quit_atom) if (g_x11_quit_atom)
XSetWMProtocols(g_dpy, g_win, &g_x11_quit_atom, 1); XSetWMProtocols(g_x11_dpy, g_x11_win, &g_x11_quit_atom, 1);
gfx_ctx_xegl_swap_interval(data, g_interval); gfx_ctx_xegl_swap_interval(data, g_interval);
@ -606,20 +603,20 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
* so override errors for this call. * so override errors for this call.
*/ */
old_handler = XSetErrorHandler(egl_nul_handler); old_handler = XSetErrorHandler(egl_nul_handler);
XSetInputFocus(g_dpy, g_win, RevertToNone, CurrentTime); XSetInputFocus(g_x11_dpy, g_x11_win, RevertToNone, CurrentTime);
XSync(g_dpy, False); XSync(g_x11_dpy, False);
XSetErrorHandler(old_handler); XSetErrorHandler(old_handler);
XFree(vi); XFree(vi);
g_x11_has_focus = true; g_x11_has_focus = true;
g_inited = true; g_inited = true;
if (!x11_create_input_context(g_dpy, g_win, &g_xim, &g_xic)) if (!x11_create_input_context(g_x11_dpy, g_x11_win, &g_xim, &g_x11_xic))
goto error; goto error;
driver->display_type = RARCH_DISPLAY_X11; driver->display_type = RARCH_DISPLAY_X11;
driver->video_display = (uintptr_t)g_dpy; driver->video_display = (uintptr_t)g_x11_dpy;
driver->video_window = (uintptr_t)g_win; driver->video_window = (uintptr_t)g_x11_win;
g_true_full = true_full; g_true_full = true_full;
return true; return true;
@ -636,7 +633,7 @@ static void gfx_ctx_xegl_destroy(void *data)
{ {
(void)data; (void)data;
x11_destroy_input_context(&g_xim, &g_xic); x11_destroy_input_context(&g_xim, &g_x11_xic);
if (g_egl_dpy) if (g_egl_dpy)
{ {
@ -661,7 +658,7 @@ static void gfx_ctx_xegl_destroy(void *data)
g_egl_dpy = NULL; g_egl_dpy = NULL;
g_egl_config = 0; g_egl_config = 0;
if (g_win) if (g_x11_win)
{ {
/* Save last used monitor for later. */ /* Save last used monitor for later. */
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
@ -669,34 +666,34 @@ static void gfx_ctx_xegl_destroy(void *data)
Window child; Window child;
int x = 0, y = 0; int x = 0, y = 0;
XGetWindowAttributes(g_dpy, g_win, &target); XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
XTranslateCoordinates(g_dpy, g_win, RootWindow(g_dpy, DefaultScreen(g_dpy)), XTranslateCoordinates(g_x11_dpy, g_x11_win, RootWindow(g_x11_dpy, DefaultScreen(g_x11_dpy)),
target.x, target.y, &x, &y, &child); target.x, target.y, &x, &y, &child);
g_screen = x11_get_xinerama_monitor(g_dpy, x, y, g_screen = x11_get_xinerama_monitor(g_x11_dpy, x, y,
target.width, target.height); target.width, target.height);
RARCH_LOG("[X/EGL]: Saved monitor #%u.\n", g_screen); RARCH_LOG("[X/EGL]: Saved monitor #%u.\n", g_screen);
#endif #endif
XUnmapWindow(g_dpy, g_win); XUnmapWindow(g_x11_dpy, g_x11_win);
XDestroyWindow(g_dpy, g_win); XDestroyWindow(g_x11_dpy, g_x11_win);
g_win = None; g_x11_win = None;
} }
if (g_cmap) if (g_cmap)
{ {
XFreeColormap(g_dpy, g_cmap); XFreeColormap(g_x11_dpy, g_cmap);
g_cmap = None; g_cmap = None;
} }
if (g_should_reset_mode) if (g_should_reset_mode)
{ {
x11_exit_fullscreen(g_dpy, &g_desktop_mode); x11_exit_fullscreen(g_x11_dpy, &g_desktop_mode);
g_should_reset_mode = false; g_should_reset_mode = false;
} }
/* Do not close g_dpy. We'll keep one for the entire application /* Do not close g_x11_dpy. We'll keep one for the entire application
* lifecycle to work-around nVidia EGL limitations. * lifecycle to work-around nVidia EGL limitations.
*/ */
g_inited = false; g_inited = false;
@ -723,9 +720,9 @@ static bool gfx_ctx_xegl_has_focus(void *data)
if (!g_inited) if (!g_inited)
return false; return false;
XGetInputFocus(g_dpy, &win, &rev); XGetInputFocus(g_x11_dpy, &win, &rev);
return (win == g_win && g_x11_has_focus) || g_true_full; return (win == g_x11_win && g_x11_has_focus) || g_true_full;
} }
static bool gfx_ctx_xegl_suppress_screensaver(void *data, bool enable) static bool gfx_ctx_xegl_suppress_screensaver(void *data, bool enable)
@ -791,7 +788,7 @@ static bool gfx_ctx_xegl_bind_api(void *data,
static void gfx_ctx_xegl_show_mouse(void *data, bool state) static void gfx_ctx_xegl_show_mouse(void *data, bool state)
{ {
(void)data; (void)data;
x11_show_mouse(g_dpy, g_win, state); x11_show_mouse(g_x11_dpy, g_x11_win, state);
} }
static void gfx_ctx_xegl_bind_hw_render(void *data, bool enable) static void gfx_ctx_xegl_bind_hw_render(void *data, bool enable)