mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

add back the glx version checking that was incorrectly removed

master
insofaras 2016-03-04 22:22:55 +00:00
parent 785be12764
commit 7e815c62d7
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
linux_4ed.cpp
View File

@ -1383,6 +1383,28 @@ InitializeOpenGLContext(Display *XDisplay, Window XWindow, GLXFBConfig &bestFbc,
return(ctx); return(ctx);
} }
internal b32
GLXCanUseFBConfig(Display *XDisplay)
{
b32 Result = false;
int GLXMajor, GLXMinor;
char *XVendor = ServerVendor(XDisplay);
printf("XWindows vendor: %s\n", XVendor);
if(glXQueryVersion(XDisplay, &GLXMajor, &GLXMinor))
{
printf("GLX version %d.%d\n", GLXMajor, GLXMinor);
if(((GLXMajor == 1 ) && (GLXMinor >= 3)) ||
(GLXMajor > 1))
{
Result = true;
}
}
return(Result);
}
typedef struct glx_config_result{ typedef struct glx_config_result{
b32 Found; b32 Found;
GLXFBConfig BestConfig; GLXFBConfig BestConfig;
@ -1874,7 +1896,12 @@ main(int argc, char **argv)
} }
int XScreenCount = ScreenCount(linuxvars.XDisplay); int XScreenCount = ScreenCount(linuxvars.XDisplay);
glx_config_result Config; glx_config_result Config = {};
if(!GLXCanUseFBConfig(linuxvars.XDisplay)){
fprintf(stderr, "Your GLX version is too old.\n");
exit(1);
}
for(int XScreenIndex = 0; for(int XScreenIndex = 0;
XScreenIndex < XScreenCount; XScreenIndex < XScreenCount;