Merge fixes.

This commit is contained in:
Themaister 2013-06-30 23:22:37 +02:00
parent 4e5c6b0f9a
commit 913ad7753a
2 changed files with 3 additions and 0 deletions

View File

@ -408,6 +408,7 @@ static bool gfx_ctx_set_video_mode(
if (g_is_double)
{
const char *swap_func = NULL;
g_pglSwapInterval = (int (*)(int))glXGetProcAddress((const GLubyte*)"glXSwapIntervalMESA");
if (g_pglSwapInterval)
swap_func = "glXSwapIntervalMESA";
@ -458,6 +459,7 @@ static void gfx_ctx_destroy(void)
{
if (g_dpy && g_ctx)
{
glFinish();
glXMakeContextCurrent(g_dpy, None, None, NULL);
if (!driver.video_cache_context)
{

View File

@ -490,6 +490,7 @@ static void gfx_ctx_destroy(void)
{
if (g_hrc)
{
glFinish();
wglMakeCurrent(NULL, NULL);
if (!driver.video_cache_context)