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

Improvements to the handling of deletion of OpenGL rendering objets such as

Browse Source 
display lists and textures object such that they can be deleted according
to an available amount of time given to do deletes.
This commit is contained in:
Robert Osfield
2003-07-16 09:52:43 +00:00
parent 82008d5ecd
commit a0d0803f1f
5 changed files with 153 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/osg/Texture.cpp
View File

@@ -16,6 +16,7 @@
#include <osg/State>
#include <osg/Notify>
#include <osg/GLU>
#include <osg/Timer>
using namespace osg;
@@ -95,41 +96,53 @@ void Texture::TextureObjectManager::addTextureObjectsFrom(Texture& texture)
texture.takeTextureObjects(_textureObjectListMap);
}
void Texture::TextureObjectManager::flushTextureObjects(unsigned int contextID,double currentTime, double& availbleTime)
void Texture::TextureObjectManager::flushTextureObjects(unsigned int contextID,double currentTime, double& availableTime)
{
// if no time available don't try to flush objects.
if (availableTime<=0.0) return;
TextureObjectList& tol = _textureObjectListMap[contextID];
const osg::Timer& timer = *osg::Timer::instance();
osg::Timer_t start_tick = timer.tick();
double elapsedTime = 0.0;
// reset the time of any uninitialized objects.
TextureObjectList::iterator itr;
for(itr=tol.begin();
itr!=tol.end();
++itr)
TextureObjectListMap::iterator tmitr = _textureObjectListMap.find(contextID);
if (tmitr!=_textureObjectListMap.end())
{
if ((*itr)->_timeStamp==0.0) (*itr)->_timeStamp=currentTime;
TextureObjectList& tol = tmitr->second;
// reset the time of any uninitialized objects.
TextureObjectList::iterator itr;
for(itr=tol.begin();
itr!=tol.end();
++itr)
{
if ((*itr)->_timeStamp==0.0) (*itr)->_timeStamp=currentTime;
}
double expiryTime = currentTime-_expiryDelay;
unsigned int numTexturesDeleted = 0;
for(itr=tol.begin();
itr!=tol.end() && elapsedTime<availableTime;
)
{
if ((*itr)->_timeStamp<expiryTime)
{
glDeleteTextures( 1L, &((*itr)->_id));
itr = tol.erase(itr);
++numTexturesDeleted;
}
else
{
++itr;
}
elapsedTime = timer.delta_s(start_tick,timer.tick());
}
if (numTexturesDeleted) notify(osg::INFO)<<"Number of Texture's deleted = "<<numTexturesDeleted<<std::endl;
}
_expiryDelay = 10.0;
double expiryTime = currentTime-_expiryDelay;
//unsigned int numTexturesDeleted = 0;
for(itr=tol.begin();
itr!=tol.end();
)
{
if ((*itr)->_timeStamp<expiryTime)
{
glDeleteTextures( 1L, &((*itr)->_id));
itr = tol.erase(itr);
//++numTexturesDeleted;
}
else
{
++itr;
}
}
//if (numTexturesDeleted) std::cout<<" deleted "<<numTexturesDeleted<<" textures"<<std::endl;
availableTime -= elapsedTime;
}
static ref_ptr<Texture::TextureObjectManager> s_textureObjectManager;