From b89c79e905fb6d8187c066652657c70ccb18b07d Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Mon, 3 Jun 2013 01:53:43 +0200
Subject: [PATCH] Delay deleting replaced textures (m_texture_trash)
---
src/tile.cpp | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/tile.cpp b/src/tile.cpp
index 5f25e123b..098a963a8 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -440,6 +440,10 @@ class TextureSource : public IWritableTextureSource
// Queued texture fetches (to be processed by the main thread)
RequestQueue<std::string, u32, u8, u8> m_get_texture_queue;
+
+ // Textures that have been overwritten with other ones
+ // but can't be deleted because the ITexture* might still be used
+ std::list<video::ITexture*> m_texture_trash;
};
IWritableTextureSource* createTextureSource(IrrlichtDevice *device)
@@ -485,6 +489,16 @@ TextureSource::~TextureSource()
}
m_atlaspointer_cache.clear();
+ for (std::list<video::ITexture*>::iterator iter =
+ m_texture_trash.begin(); iter != m_texture_trash.end();
+ iter++)
+ {
+ video::ITexture *t = *iter;
+
+ //cleanup trashed texture
+ driver->removeTexture(t);
+ }
+
infostream << "~TextureSource() "<< textures_before << "/"
<< driver->getTextureCount() << std::endl;
}
@@ -870,7 +884,7 @@ void TextureSource::rebuildImagesAndTextures()
sap->intsize = img->getDimension();
if (t_old != 0)
- driver->removeTexture(t_old);
+ m_texture_trash.push_back(t_old);
}
}
--
GitLab