ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fail to start if glx display in glew is not available.

Browse Source 
It should be safe, because we check if display is available in irrlicht device anyway.
This commit is contained in:
Deve 2018-01-13 00:06:37 +01:00
parent f220bb14f4
commit 2f7d7b677d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/glwrap.cpp
View File

@ -160,6 +160,7 @@ void initGL()
{
if (is_gl_init)
return;
is_gl_init = true;
// For Mesa extension reporting
#if !defined(USE_GLES2)
@ -167,8 +168,15 @@ void initGL()
glewExperimental = GL_TRUE;
#endif
GLenum err = glewInit();
if (GLEW_OK != err)
Log::fatal("GLEW", "Glew initialisation failed with error %s", glewGetErrorString(err));
if (err == GLEW_ERROR_NO_GLX_DISPLAY)
{
Log::info("GLEW", "Glew couldn't open glx display.");
}
else if (err != GLEW_OK)
{
Log::fatal("GLEW", "Glew initialization failed with error %s", glewGetErrorString(err));
}
#else
#ifdef ARB_DEBUG_OUTPUT
glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)eglGetProcAddress("glDebugMessageCallbackKHR");