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

Changed:

Browse Source 
static TextureGLModeSet s_textureGLModeSet;

To:

  static TextureGLModeSet& getTextureGLModeSet()
  {
      static TextureGLModeSet s_textureGLModeSet;
      return s_textureGLModeSet;
  }

to prevent static initialization problems under static builds.
This commit is contained in:
Robert Osfield
2006-08-03 13:35:21 +00:00
parent 7b313eef34
commit 7ef12b37b5
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osg/StateSet.cpp
View File

@@ -67,8 +67,11 @@ class TextureGLModeSet
};
TextureGLModeSet s_textureGLModeSet;
static TextureGLModeSet& getTextureGLModeSet()
{
static TextureGLModeSet s_textureGLModeSet;
return s_textureGLModeSet;
}
StateSet::StateSet()
{
@@ -655,7 +658,7 @@ void StateSet::merge(const StateSet& rhs)
void StateSet::setMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
{
if (!s_textureGLModeSet.isTextureMode(mode))
if (!getTextureGLModeSet().isTextureMode(mode))
{
setMode(_modeList,mode,value);
}
@@ -671,7 +674,7 @@ void StateSet::setMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue
void StateSet::removeMode(StateAttribute::GLMode mode)
{
if (!s_textureGLModeSet.isTextureMode(mode))
if (!getTextureGLModeSet().isTextureMode(mode))
{
setModeToInherit(_modeList,mode);
}
@@ -688,7 +691,7 @@ void StateSet::removeMode(StateAttribute::GLMode mode)
StateAttribute::GLModeValue StateSet::getMode(StateAttribute::GLMode mode) const
{
if (!s_textureGLModeSet.isTextureMode(mode))
if (!getTextureGLModeSet().isTextureMode(mode))
{
return getMode(_modeList,mode);
}
@@ -959,7 +962,7 @@ const StateSet::RefUniformPair* StateSet::getUniformPair(const std::string& name
void StateSet::setTextureMode(unsigned int unit,StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
{
if (s_textureGLModeSet.isTextureMode(mode))
if (getTextureGLModeSet().isTextureMode(mode))
{
setMode(getOrCreateTextureModeList(unit),mode,value);
}
@@ -975,7 +978,7 @@ void StateSet::setTextureMode(unsigned int unit,StateAttribute::GLMode mode, Sta
void StateSet::removeTextureMode(unsigned int unit,StateAttribute::GLMode mode)
{
if (s_textureGLModeSet.isTextureMode(mode))
if (getTextureGLModeSet().isTextureMode(mode))
{
if (unit>=_textureModeList.size()) return;
setModeToInherit(_textureModeList[unit],mode);
@@ -993,7 +996,7 @@ void StateSet::removeTextureMode(unsigned int unit,StateAttribute::GLMode mode)
StateAttribute::GLModeValue StateSet::getTextureMode(unsigned int unit,StateAttribute::GLMode mode) const
{
if (s_textureGLModeSet.isTextureMode(mode))
if (getTextureGLModeSet().isTextureMode(mode))
{
if (unit>=_textureModeList.size()) return StateAttribute::INHERIT;
return getMode(_textureModeList[unit],mode);