mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-26 08:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with assert failure when JSON dump is created while a custom pool exist with specified string name

Browse Source
This commit is contained in:
Adam Sawicki 2022-03-29 17:24:48 +02:00
parent 5b598e0a35
commit 2d2a9e3df3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vk_mem_alloc.h
View File

@ -16006,8 +16006,8 @@ void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)
json.ContinueString_Size(index++); json.ContinueString_Size(index++);
if (pool->GetName()) if (pool->GetName())
{ {
json.WriteString(" - "); json.ContinueString(" - ");
json.WriteString(pool->GetName()); json.ContinueString(pool->GetName());
} }
json.EndString(); json.EndString();

5
src/Tests.cpp
View File

@ -5175,6 +5175,11 @@ static void TestPool_SameSize()
vmaGetPoolName(g_hAllocator, pool, &fetchedPoolName); vmaGetPoolName(g_hAllocator, pool, &fetchedPoolName);
TEST(strcmp(fetchedPoolName, POOL_NAME) == 0); TEST(strcmp(fetchedPoolName, POOL_NAME) == 0);
// Generate JSON dump. There was a bug with this...
char* json = nullptr;
vmaBuildStatsString(g_hAllocator, &json, VK_TRUE);
vmaFreeStatsString(g_hAllocator, json);
vmaSetPoolName(g_hAllocator, pool, nullptr); vmaSetPoolName(g_hAllocator, pool, nullptr);
} }