ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use GLX 1.3 more correctly.

This commit is contained in:
Themaister 2013-02-14 15:40:07 +01:00
parent c5c22c6243
commit 236cae258d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/context/glx_ctx.c
View File

@ -30,6 +30,7 @@
static Display *g_dpy; static Display *g_dpy;
static Window g_win; static Window g_win;
static GLXWindow g_glx_win;
static Colormap g_cmap; static Colormap g_cmap;
static Atom g_quit_atom; static Atom g_quit_atom;
static bool g_has_focus; static bool g_has_focus;
@ -229,7 +230,7 @@ static void gfx_ctx_check_window(bool *quit,
static void gfx_ctx_swap_buffers(void) static void gfx_ctx_swap_buffers(void)
{ {
if (g_is_double) if (g_is_double)
glXSwapBuffers(g_dpy, g_win); glXSwapBuffers(g_dpy, g_glx_win);
} }
static void gfx_ctx_set_resize(unsigned width, unsigned height) static void gfx_ctx_set_resize(unsigned width, unsigned height)
@ -281,6 +282,8 @@ static bool gfx_ctx_init(void)
if (g_inited) if (g_inited)
return false; return false;
XInitThreads();
static const int visual_attribs[] = { static const int visual_attribs[] = {
GLX_X_RENDERABLE , True, GLX_X_RENDERABLE , True,
GLX_DRAWABLE_TYPE , GLX_WINDOW_BIT, GLX_DRAWABLE_TYPE , GLX_WINDOW_BIT,
@ -402,6 +405,8 @@ static bool gfx_ctx_set_video_mode(
CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa); CWBorderPixel | CWColormap | CWEventMask | (true_full ? CWOverrideRedirect : 0), &swa);
XSetWindowBackground(g_dpy, g_win, 0); XSetWindowBackground(g_dpy, g_win, 0);
g_glx_win = glXCreateWindow(g_dpy, g_fbc, g_win, 0);
gfx_ctx_update_window_title(true); gfx_ctx_update_window_title(true);
x11_set_window_attr(g_dpy, g_win); x11_set_window_attr(g_dpy, g_win);
@ -444,7 +449,7 @@ static bool gfx_ctx_set_video_mode(
goto error; goto error;
} }
glXMakeCurrent(g_dpy, g_win, g_ctx); glXMakeContextCurrent(g_dpy, g_glx_win, g_glx_win, g_ctx);
XSync(g_dpy, False); XSync(g_dpy, False);
g_quit_atom = XInternAtom(g_dpy, "WM_DELETE_WINDOW", False); g_quit_atom = XInternAtom(g_dpy, "WM_DELETE_WINDOW", False);
@ -493,13 +498,16 @@ static void gfx_ctx_destroy(void)
{ {
if (g_dpy && g_ctx) if (g_dpy && g_ctx)
{ {
glXMakeCurrent(g_dpy, None, NULL); glXMakeContextCurrent(g_dpy, None, None, NULL);
glXDestroyContext(g_dpy, g_ctx); glXDestroyContext(g_dpy, g_ctx);
g_ctx = NULL; g_ctx = NULL;
} }
if (g_win) if (g_win)
{ {
glXDestroyWindow(g_dpy, g_glx_win);
g_glx_win = 0;
// Save last used monitor for later. // Save last used monitor for later.
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
XWindowAttributes target; XWindowAttributes target;