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

Moved static string initialization into singleton method

Browse Source
This commit is contained in:
Robert Osfield 2009-08-17 15:22:01 +00:00
parent 2916d9b7ea
commit 804f7622cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/GLExtensions.cpp
View File

@ -39,9 +39,6 @@ static osg::buffered_object<ExtensionSet> s_gluExtensionSetList;
static osg::buffered_object<std::string> s_gluRendererList; static osg::buffered_object<std::string> s_gluRendererList;
static osg::buffered_value<int> s_gluInitializedList; static osg::buffered_value<int> s_gluInitializedList;
static const char* envVar = getenv("OSG_GL_EXTENSION_DISABLE");
static std::string s_GLExtensionDisableString(envVar?envVar:"Nothing defined");
float osg::getGLVersionNumber() float osg::getGLVersionNumber()
{ {
// needs to be extended to do proper things with subversions like 1.5.1, etc. // needs to be extended to do proper things with subversions like 1.5.1, etc.
@ -232,6 +229,9 @@ void osg::setGLExtensionDisableString(const std::string& disableString)
std::string& osg::getGLExtensionDisableString() std::string& osg::getGLExtensionDisableString()
{ {
static const char* envVar = getenv("OSG_GL_EXTENSION_DISABLE");
static std::string s_GLExtensionDisableString(envVar?envVar:"Nothing defined");
return s_GLExtensionDisableString; return s_GLExtensionDisableString;
} }