fly/flightgear
1
0
Fork 0
Code Activity

Fix crashing without support for GLSL/OpenGL 2.0

Browse source
This commit is contained in:
Thomas Geymayer 2013-04-24 00:19:03 +02:00
parent 5146868bfb
commit 220f359d34
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/GUI/gui.cxx
View file

@ -120,8 +120,15 @@ struct GeneralInitOperation : public GraphicsContextOperation
simRendering->setStringValue("gl-version", (char*) glGetString(GL_VERSION)); simRendering->setStringValue("gl-version", (char*) glGetString(GL_VERSION));
SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VERSION)); SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_VERSION));
simRendering->setStringValue("gl-shading-language-version", (char*) glGetString(GL_SHADING_LANGUAGE_VERSION)); // Old hardware without support for OpenGL 2.0 does not support GLSL and
SG_LOG( SG_GENERAL, SG_INFO, glGetString(GL_SHADING_LANGUAGE_VERSION)); // glGetString returns NULL for GL_SHADING_LANGUAGE_VERSION.
//
// See http://flightgear.org/forums/viewtopic.php?f=17&t=19670&start=15#p181945
const char* glsl_version = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
if( !glsl_version )
glsl_version = "UNSUPPORTED";
simRendering->setStringValue("gl-shading-language-version", glsl_version);
SG_LOG( SG_GENERAL, SG_INFO, glsl_version);
GLint tmp; GLint tmp;
glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp ); glGetIntegerv( GL_MAX_TEXTURE_SIZE, &tmp );