Merge pull request #8 from Mith/master

Fixed MESA_swap_control copy-pasta.
This commit is contained in:
Camilla Löwy Berglund 2012-07-17 04:44:44 -07:00
commit 7fb251c626

View File

@ -546,11 +546,11 @@ int _glfwInitOpenGL(void)
if (_glfwPlatformExtensionSupported("GLX_MESA_swap_control"))
{
window->GLX.SwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)
_glfwLibrary.GLX.SwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)
_glfwPlatformGetProcAddress("glXSwapIntervalMESA");
if (window->GLX.SwapIntervalMESA)
window->GLX.MESA_swap_control = GL_TRUE;
if (_glfwLibrary.GLX.SwapIntervalMESA)
_glfwLibrary.GLX.MESA_swap_control = GL_TRUE;
}
if (_glfwPlatformExtensionSupported("GLX_SGIX_fbconfig"))
@ -731,12 +731,12 @@ void _glfwPlatformSwapInterval(int interval)
window->X11.handle,
interval);
}
else if (window->GLX.MESA_swap_control)
window->GLX.SwapIntervalMESA(interval);
else if (window->GLX.SGI_swap_control)
else if (_glfwLibrary.GLX.MESA_swap_control)
_glfwLibrary.GLX.SwapIntervalMESA(interval);
else if (_glfwLibrary.GLX.SGI_swap_control)
{
if (interval > 0)
window->GLX.SwapIntervalSGI(interval);
_glfwLibrary.GLX.SwapIntervalSGI(interval);
}
}