AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Clear the 'last accessed block' flag before flushing the volume.

Browse Source
This commit is contained in:
Daviw Williams 2013-11-12 16:57:11 +01:00
parent 85d8bdb30c
commit 5294efc473
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@ -436,6 +436,9 @@ namespace PolyVox
{ {
typename CompressedBlockMap::iterator i; typename CompressedBlockMap::iterator i;
// Flushing will remove the most accessed block, so invalidate the pointer.
m_pLastAccessedBlock = 0;
//Replaced the for loop here as the call to //Replaced the for loop here as the call to
//eraseBlock was invalidating the iterator. //eraseBlock was invalidating the iterator.
while(m_pUncompressedBlockCache.size() > 0) while(m_pUncompressedBlockCache.size() > 0)
@ -585,14 +588,10 @@ namespace PolyVox
{ {
UncompressedBlock<VoxelType>* pUncompressedBlock = itUncompressedBlock->second; UncompressedBlock<VoxelType>* pUncompressedBlock = itUncompressedBlock->second;
// This should not often happen as blocks are normally deleted based on being least recently used. // This should never happen as blocks are deleted based on being least recently used.
// However, I can imagine that flushing a large number of blocks could cause this to occur. Just // I the case that we are flushing we delete all blocks, but the flush function will
// to be safe we handle it by invalidating the last accessed block pointer. // reset the 'm_pLastAccessedBlock' anyway to prevent it being accidentally reused.
if(pUncompressedBlock == m_pLastAccessedBlock) POLYVOX_ASSERT(pUncompressedBlock != m_pLastAccessedBlock, "Attempted to delete last accessed block.");
{
logWarning() << "The last accessed block is being erased from the uncompressed cache.";
m_pLastAccessedBlock = 0;
}
// Before deleting the block we may need to recompress its data. We // Before deleting the block we may need to recompress its data. We
// only do this if the data has been modified since it was decompressed. // only do this if the data has been modified since it was decompressed.