FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use osgDB::SharedStateManager::share in SGLoadTexture2D

Browse Source 
It is not safe to call this function from the database pager thread;
in any event, state sets and textures created in the database pager
will get passed through the SharedStateManager anyway.
This commit is contained in:
timoore
2008-08-29 07:39:05 +00:00
parent ff654ab094
commit 12495547c4
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/scene/model/model.cxx
View File

@@ -56,26 +56,6 @@ SGLoadTexture2D(bool staticTexture, const std::string& path,
}
}
// Make sure the texture is shared if we already have the same texture
// somewhere ...
{
osg::ref_ptr<osg::Node> tmpNode = new osg::Node;
osg::StateSet* stateSet = tmpNode->getOrCreateStateSet();
stateSet->setTextureAttribute(0, texture.get());
// OSGFIXME: don't forget that mutex here
osgDB::Registry* registry = osgDB::Registry::instance();
registry->getSharedStateManager()->share(tmpNode.get(), 0);
// should be the same, but be paranoid ...
stateSet = tmpNode->getStateSet();
osg::StateAttribute* stateAttr;
stateAttr = stateSet->getTextureAttribute(0, osg::StateAttribute::TEXTURE);
osg::Texture2D* texture2D = dynamic_cast<osg::Texture2D*>(stateAttr);
if (texture2D)
texture = texture2D;
}
return texture.release();
}