zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- disable the freelist management for discarded tiles.

Browse source 
This does not work as implemented - may be checked out later, but this is not essential.
This commit is contained in:
Christoph Oelckers 2022-12-11 10:18:38 +01:00
parent 20edd800f9
commit 6ff91f8ebc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/core/textures/tiletexture.cpp
View file

@ -299,7 +299,11 @@ static FImageSource* GetTileImage(const TArray<uint8_t>& backingstore, uint32_t
void* mem = nullptr; void* mem = nullptr;
if (freelist.Size() > 0) freelist.Pop(mem); if (freelist.Size() > 0) freelist.Pop(mem);
// recycle discarded image sources if available. They are all the same type so this is safe. // recycle discarded image sources if available. They are all the same type so this is safe.
if (mem) tex = new(mem) FArtTile(backingstore, offset, width, height); if (mem)
{
memset(mem, 0, sizeof(FArtTile));
tex = new(mem) FArtTile(backingstore, offset, width, height);
}
else tex = new FArtTile(backingstore, offset, width, height); else tex = new FArtTile(backingstore, offset, width, height);
auto p = &backingstore[offset]; auto p = &backingstore[offset];
auto siz = width * height; auto siz = width * height;
@ -361,7 +365,10 @@ static void GetImagesFromFile(TArray<FImageSource*>& array, TArray<unsigned>& pi
if (array[i] && i < oldsize) if (array[i] && i < oldsize)
{ {
array[i]->~FImageSource(); // really a no-op but let's stay on the safe side. array[i]->~FImageSource(); // really a no-op but let's stay on the safe side.
#if 0
// recycling items causes corruption so disable for now and revisit later.
freelist.Push(array[i]); freelist.Push(array[i]);
#endif
} }
array[i] = nullptr; array[i] = nullptr;
continue; continue;