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

Fixed method to match parent class.

Browse Source
This commit is contained in:
Robert Osfield 2016-06-02 14:31:44 +01:00
parent 09bad85522
commit d038866649
2 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/BufferObject
View File

@ -360,7 +360,7 @@ class OSG_EXPORT GLBufferObjectManager : public GraphicsObjectManager
void newFrame(osg::FrameStamp* fs); void newFrame(osg::FrameStamp* fs);
void resetStats(); void resetStats();
void reportStats(std::ostream& out); void reportStats(std::ostream& out);
void recomputeStats(std::ostream& out); void recomputeStats(std::ostream& out) const;
unsigned int& getFrameNumber() { return _frameNumber; } unsigned int& getFrameNumber() { return _frameNumber; }
unsigned int& getNumberFrames() { return _numFrames; } unsigned int& getNumberFrames() { return _numFrames; }

6
src/osg/BufferObject.cpp
View File

@ -1018,7 +1018,7 @@ void GLBufferObjectManager::resetStats()
_applyTime = 0; _applyTime = 0;
} }
void GLBufferObjectManager::recomputeStats(std::ostream& out) void GLBufferObjectManager::recomputeStats(std::ostream& out) const
{ {
out<<"GLBufferObjectMananger::recomputeStats()"<<std::endl; out<<"GLBufferObjectMananger::recomputeStats()"<<std::endl;
unsigned int numObjectsInLists = 0; unsigned int numObjectsInLists = 0;
@ -1026,11 +1026,11 @@ void GLBufferObjectManager::recomputeStats(std::ostream& out)
unsigned int numOrphans = 0; unsigned int numOrphans = 0;
unsigned int numPendingOrphans = 0; unsigned int numPendingOrphans = 0;
unsigned int currentSize = 0; unsigned int currentSize = 0;
for(GLBufferObjectSetMap::iterator itr = _glBufferObjectSetMap.begin(); for(GLBufferObjectSetMap::const_iterator itr = _glBufferObjectSetMap.begin();
itr != _glBufferObjectSetMap.end(); itr != _glBufferObjectSetMap.end();
++itr) ++itr)
{ {
GLBufferObjectSet* os = itr->second.get(); const GLBufferObjectSet* os = itr->second.get();
numObjectsInLists += os->computeNumGLBufferObjectsInList(); numObjectsInLists += os->computeNumGLBufferObjectsInList();
numActive += os->getNumOfGLBufferObjects(); numActive += os->getNumOfGLBufferObjects();
numOrphans += os->getNumOrphans(); numOrphans += os->getNumOrphans();