Form Jorge Ciges, improved GL version detection code.

2011-05-26 16:52:08 +00:00
parent 3fa1f2ed5a
commit e3f7d802e4
4 changed files with 28 additions and 13 deletions
--- a/src/osg/GLExtensions.cpp
+++ b/src/osg/GLExtensions.cpp
@@ -66,12 +66,7 @@ float osg::getGLVersionNumber()
    char *versionstring   = (char*) glGetString( GL_VERSION );
    if (!versionstring) return 0.0;

-    std::string vs( versionstring );
-    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
-        return( asciiToFloat( vs.substr( vs.find( "ES " )+3 ).c_str() ) );
-    #else
-        return( asciiToFloat( vs.substr( vs.find( " " )+1 ).c_str() ) );
-    #endif
+    return (findAsciiToFloat(versionstring));
 }

 bool osg::isExtensionInExtensionString(const char *extension, const char *extensionString)