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

OcclusionQueryNode: make all usages of 'updateDefaultQueryGeometry' thread safe

Browse Source
This commit is contained in:
Daniel Trstenjak 2019-08-23 09:59:54 +02:00 committed by Julien Valentin
parent ddb72691bc
commit 995e849e8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/OcclusionQueryNode.cpp
View File

@ -759,8 +759,6 @@ void OcclusionQueryNode::setQueryGeometryInternal( QueryGeometry* queryGeom,
return; return;
} }
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _computeBoundMutex ) ;
_queryGeometryState = state; _queryGeometryState = state;
_queryGeode->removeDrawables(0, _queryGeode->getNumDrawables()); _queryGeode->removeDrawables(0, _queryGeode->getNumDrawables());
@ -836,6 +834,8 @@ void OcclusionQueryNode::discardDeletedQueryObjects( unsigned int contextID )
void OcclusionQueryNode::setQueryGeometry( QueryGeometry* geom ) void OcclusionQueryNode::setQueryGeometry( QueryGeometry* geom )
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock( _computeBoundMutex ) ;
if (geom) if (geom)
{ {
setQueryGeometryInternal( geom, geom, USER_DEFINED ); setQueryGeometryInternal( geom, geom, USER_DEFINED );