FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Form Jorge Ciges, improved GL version detection code.

Browse Source
This commit is contained in:
Robert Osfield
2011-05-26 16:52:08 +00:00
parent 3fa1f2ed5a
commit e3f7d802e4
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osg/GL2Extensions.cpp
View File

@@ -517,7 +517,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
return;
}
_glVersion = asciiToFloat( version );
_glVersion = findAsciiToFloat( version );
_glslLanguageVersion = 0.0f;
bool shadersBuiltIn = OSG_GLES2_FEATURES || OSG_GL3_FEATURES;
@@ -540,12 +540,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
const char* langVerStr = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
if( (glGetError() == GL_NO_ERROR) && langVerStr )
{
std::string glslvs( langVerStr );
#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
_glslLanguageVersion = ( asciiToFloat( glslvs.substr( glslvs.find( "GLSL ES " )+8 ).c_str() ) );
#else
_glslLanguageVersion = ( asciiToFloat( glslvs.substr( glslvs.find( "GLSL "+5 ) ).c_str() ) );
#endif
_glslLanguageVersion = (findAsciiToFloat(langVerStr));
}
else
_glslLanguageVersion = 1.0f;