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

From Jannik Heller, "This submission fixes a typo in the new GLObjectManager

Browse Source 
sheduleGLObjectForDeletion(GLuint globj);

should be

scheduleGLObjectForDeletion(GLuint globj)"
This commit is contained in:
Robert Osfield 2016-01-19 14:49:56 +00:00
parent b3e0f83c07
commit e5a7c353ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/GLObjects
View File

@ -109,7 +109,7 @@ public:
virtual void discardAllGLObjects(); virtual void discardAllGLObjects();
/** schedule a GL object for deletion by the graphics thread.*/ /** schedule a GL object for deletion by the graphics thread.*/
virtual void sheduleGLObjectForDeletion(GLuint globj); virtual void scheduleGLObjectForDeletion(GLuint globj);
/** implementation of the actual creation of an GL object - subclasses from GLObjectManager must implement the appropriate GL calls.*/ /** implementation of the actual creation of an GL object - subclasses from GLObjectManager must implement the appropriate GL calls.*/
virtual GLuint createGLObject(); virtual GLuint createGLObject();

2
src/osg/GLObjects.cpp
View File

@ -134,7 +134,7 @@ void GLObjectManager::discardAllGLObjects()
_deleteGLObjectHandles.clear(); _deleteGLObjectHandles.clear();
} }
void GLObjectManager::sheduleGLObjectForDeletion(GLuint globj) void GLObjectManager::scheduleGLObjectForDeletion(GLuint globj)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);

4
src/osg/OcclusionQueryNode.cpp
View File

@ -384,7 +384,7 @@ QueryGeometry::releaseGLObjects( osg::State* state ) const
if (tr._contextID == contextID) if (tr._contextID == contextID)
{ {
#if 1 #if 1
osg::get<QueryObjectManager>(contextID)->sheduleGLObjectForDeletion(tr._id ); osg::get<QueryObjectManager>(contextID)->scheduleGLObjectForDeletion(tr._id );
#else #else
QueryGeometry::deleteQueryObject( contextID, tr._id ); QueryGeometry::deleteQueryObject( contextID, tr._id );
#endif #endif
@ -398,7 +398,7 @@ QueryGeometry::releaseGLObjects( osg::State* state ) const
void void
QueryGeometry::deleteQueryObject( unsigned int contextID, GLuint handle ) QueryGeometry::deleteQueryObject( unsigned int contextID, GLuint handle )
{ {
osg::get<QueryObjectManager>(contextID)->sheduleGLObjectForDeletion(handle); osg::get<QueryObjectManager>(contextID)->scheduleGLObjectForDeletion(handle);
} }