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

Fixed threading crash in osgFX that occurred when an osgFX node is added to the scene being rendered in multiple threaded windows.

Browse Source
This commit is contained in:
Robert Osfield
2018-04-04 15:09:43 +01:00
parent 74e74d76d9
commit 9168b6e5de
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osgFX/Technique
View File

@@ -123,28 +123,32 @@ namespace osgFX
private:
typedef std::vector<osg::ref_ptr<osg::StateSet> > Pass_list;
Pass_list _passes;
OpenThreads::Mutex _mutex;
OpenThreads::Atomic _passesDefined;
Pass_list _passes;
};
// INLINE METHODS
inline int Technique::getNumPasses() const
{
return static_cast<int>(_passes.size());
return _passesDefined!=0 ? static_cast<int>(_passes.size()) : 0;
}
inline osg::StateSet* Technique::getPassStateSet(int i)
{
return _passes[i].get();
return _passesDefined!=0 ? _passes[i].get() : 0;
}
inline const osg::StateSet* Technique::getPassStateSet(int i) const
{
return _passes[i].get();
return _passesDefined!=0 ? _passes[i].get() : 0;
}
inline void Technique::dirtyPasses()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _mutex);
_passesDefined.exchange(0);
_passes.clear();
}