mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-24 01:52:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix vsync crashing on linux in rare cases.

Browse source 
GLX may return a valid address in glxgetprocaddress, even for unsupported functions. While this might just be a stub on some systems, it causes a GLXBadContextTag at X_GLXVendorPrivate on others. So just check the extensions string for actual support.
This commit is contained in:
UnknownShadow200 2018-11-08 19:08:12 +11:00
parent 79803313c1
commit 3597b364a2
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/NixWindow.c
View file

@ -677,10 +677,15 @@ void Window_SetCursorVisible(bool visible) {
*#########################################################################################################################*/ *#########################################################################################################################*/
GLXContext ctx_Handle; GLXContext ctx_Handle;
typedef int (*FN_GLXSWAPINTERVAL)(int interval); typedef int (*FN_GLXSWAPINTERVAL)(int interval);
FN_GLXSWAPINTERVAL glXSwapIntervalSGI; FN_GLXSWAPINTERVAL swapIntervalMESA, swapIntervalSGI;
bool ctx_supports_vSync; bool ctx_supports_vSync;
void GLContext_Init(struct GraphicsMode* mode) { void GLContext_Init(struct GraphicsMode* mode) {
static String ext_mesa = String_FromConst("GLX_MESA_swap_control");
static String ext_sgi = String_FromConst("GLX_SGI_swap_control");
const char* raw_exts;
String exts;
ctx_Handle = glXCreateContext(win_display, &win_visual, NULL, true); ctx_Handle = glXCreateContext(win_display, &win_visual, NULL, true);
if (!ctx_Handle) { if (!ctx_Handle) {
@ -696,8 +701,18 @@ void GLContext_Init(struct GraphicsMode* mode) {
ErrorHandler_Fail("Failed to make context current."); ErrorHandler_Fail("Failed to make context current.");
} }
glXSwapIntervalSGI = (FN_GLXSWAPINTERVAL)GLContext_GetAddress("glXSwapIntervalSGI"); /* GLX may return non-null function pointers that don't actually work */
ctx_supports_vSync = glXSwapIntervalSGI != NULL; /* So we need to manually check the extensions string for support */
raw_exts = glXQueryExtensionsString(win_display, win_screen);
exts = String_FromReadonly(raw_exts);
if (String_CaselessContains(&exts, &ext_mesa)) {
swapIntervalMESA = (FN_GLXSWAPINTERVAL)GLContext_GetAddress("glXSwapIntervalMESA");
}
if (String_CaselessContains(&exts, &ext_sgi)) {
swapIntervalSGI = (FN_GLXSWAPINTERVAL)GLContext_GetAddress("glXSwapIntervalSGI");
}
ctx_supports_vSync = swapIntervalMESA || swapIntervalSGI;
} }
void GLContext_Update(void) { } void GLContext_Update(void) { }
@ -724,7 +739,11 @@ void GLContext_SetVSync(bool enabled) {
int res; int res;
if (!ctx_supports_vSync) return; if (!ctx_supports_vSync) return;
res = glXSwapIntervalSGI(enabled); if (swapIntervalMESA) {
res = swapIntervalMESA(enabled);
} else {
res = swapIntervalSGI(enabled);
}
if (res) Platform_Log1("Set VSync failed, error: %i", &res); if (res) Platform_Log1("Set VSync failed, error: %i", &res);
} }
@ -732,7 +751,7 @@ static void GLContext_GetAttribs(struct GraphicsMode* mode, int* attribs) {
int i = 0; int i = 0;
/* See http://www-01.ibm.com/support/knowledgecenter/ssw_aix_61/com.ibm.aix.opengl/doc/openglrf/glXChooseFBConfig.htm%23glxchoosefbconfig */ /* See http://www-01.ibm.com/support/knowledgecenter/ssw_aix_61/com.ibm.aix.opengl/doc/openglrf/glXChooseFBConfig.htm%23glxchoosefbconfig */
/* See http://www-01.ibm.com/support/knowledgecenter/ssw_aix_71/com.ibm.aix.opengl/doc/openglrf/glXChooseVisual.htm%23b5c84be452rree */ /* See http://www-01.ibm.com/support/knowledgecenter/ssw_aix_71/com.ibm.aix.opengl/doc/openglrf/glXChooseVisual.htm%23b5c84be452rree */
/* for the attribute declarations. Note that the attributes are different than those used in Glx.ChooseVisual */ /* for the attribute declarations. Note that the attributes are different than those used in glxChooseVisual */
if (!mode->IsIndexed) { attribs[i++] = GLX_RGBA; } if (!mode->IsIndexed) { attribs[i++] = GLX_RGBA; }
attribs[i++] = GLX_RED_SIZE; attribs[i++] = mode->R; attribs[i++] = GLX_RED_SIZE; attribs[i++] = mode->R;