ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added memory debug output for texture cache usage.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-04-28 12:48:28 +00:00
parent 84badc0eeb
commit fb4fb58ffd
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/tracks/track.cpp
View File

@ -179,9 +179,10 @@ void Track::cleanup()
if(UserConfigParams::logMemory())
{
printf("[memory] Number of meshes in cache after cleaning up '%s': %d.\n",
printf("[memory] After cleaning '%s': mesh cache %d texture cache %d\n",
getIdent().c_str(),
irr_driver->getSceneManager()->getMeshCache()->getMeshCount());
irr_driver->getSceneManager()->getMeshCache()->getMeshCount(),
irr_driver->getVideoDriver()->getTextureCount());
#ifdef DEBUG
scene::IMeshCache *cache = irr_driver->getSceneManager()->getMeshCache();
for(unsigned int i=0; i<cache->getMeshCount(); i++)
@ -198,6 +199,24 @@ void Track::cleanup()
name.getInternalName().c_str());
} // if name not found
} // for i < cache size
video::IVideoDriver *vd = irr_driver->getVideoDriver();
for(unsigned int i=0; i<vd->getTextureCount(); i++)
{
video::ITexture *t = vd->getTextureByIndex(i);
std::vector<video::ITexture*>::iterator p;
p = std::find(m_all_used_textures.begin(), m_all_used_textures.end(),
t);
if(p!=m_all_used_textures.end())
{
m_all_used_textures.erase(p);
}
else
{
printf("[memory] Leaked texture '%s'.\n",
t->getName().getInternalName().c_str());
}
}
#endif
} // if verbose
@ -964,9 +983,10 @@ void Track::loadTrackModel(World* parent, unsigned int mode_id)
assert(m_all_cached_meshes.size()==0);
if(UserConfigParams::logMemory())
{
printf("[memory] Number of meshes in cache before loading '%s': %d.\n",
printf("[memory] Before loading '%s': mesh cache %d texture cache %d\n",
getIdent().c_str(),
irr_driver->getSceneManager()->getMeshCache()->getMeshCount());
irr_driver->getSceneManager()->getMeshCache()->getMeshCount(),
irr_driver->getVideoDriver()->getTextureCount());
#ifdef DEBUG
scene::IMeshCache *cache = irr_driver->getSceneManager()->getMeshCache();
m_old_mesh_buffers.clear();
@ -975,6 +995,14 @@ void Track::loadTrackModel(World* parent, unsigned int mode_id)
const io::SNamedPath &name=cache->getMeshName(i);
m_old_mesh_buffers.push_back(name.getInternalName().c_str());
}
m_all_used_textures.clear();
video::IVideoDriver *vd = irr_driver->getVideoDriver();
for(unsigned int i=0; i<vd->getTextureCount(); i++)
{
video::ITexture *t=vd->getTextureByIndex(i);
m_all_used_textures.push_back(t);
}
#endif
}
@ -1288,9 +1316,10 @@ void Track::loadTrackModel(World* parent, unsigned int mode_id)
}
if(UserConfigParams::logMemory())
printf("[memory] Number of meshes in cache after loading '%s': %d.\n",
printf("[memory] After loading '%s': mesh cache %d texture cache %d\n",
getIdent().c_str(),
irr_driver->getSceneManager()->getMeshCache()->getMeshCount());
irr_driver->getSceneManager()->getMeshCache()->getMeshCount(),
irr_driver->getVideoDriver()->getTextureCount());
} // loadTrackModel

3
src/tracks/track.hpp
View File

@ -83,6 +83,9 @@ private:
/** The list of all meshes that are loaded from disk, which means
* that those meshes are being cached by irrlicht, and need to be freed. */
std::vector<scene::IMesh*> m_all_cached_meshes;
/** A list of textures to help in removing unused textures from irrlicht's
* texture cache after cleanup. */
std::vector<video::ITexture*> m_all_used_textures;
#ifdef DEBUG
/** Used to store all buffers in irrlicht's memory cache before a track
* is loaded. After cleanup of a track we can test which meshes are