commit 8317ba9d5ea0500ba8f52e16fe76a5681ea165c5
author Adam Sawicki <Adam.Sawicki@amd.com> Mon Nov 18 13:14:11 2019 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> Mon Nov 18 13:14:11 2019 +0100
tree 9cf0476f0c326ec66989af7602b3eea66fbc0278
parent b3f51109874bf70db94de2dca794a83bf5d64fd8

Sample/testing app: enable custom CPU allocation callbacks by default

Added allocation counting to make sure there are no memory leaks at the end.

src/VulkanSample.cpp

diff --git a/src/VulkanSample.cpp b/src/VulkanSample.cpp
index d289317..6f0db10 100644
--- a/src/VulkanSample.cpp
+++ b/src/VulkanSample.cpp
@@ -26,6 +26,7 @@
 #include "Tests.h"

 #include "VmaUsage.h"

 #include "Common.h"

+#include <atomic>

 

 static const char* const SHADER_PATH1 = "./";

 static const char* const SHADER_PATH2 = "../bin/";

@@ -37,7 +38,7 @@
 static const bool VSYNC = true;

 static const uint32_t COMMAND_BUFFER_COUNT = 2;

 static void* const CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA = (void*)(intptr_t)43564544;

-static const bool USE_CUSTOM_CPU_ALLOCATION_CALLBACKS = false;

+static const bool USE_CUSTOM_CPU_ALLOCATION_CALLBACKS = true;

 

 VkPhysicalDevice g_hPhysicalDevice;

 VkDevice g_hDevice;

@@ -109,12 +110,19 @@
 static VmaAllocation g_hTextureImageAlloc;

 static VkImageView g_hTextureImageView;

 

+static std::atomic_uint32_t g_CpuAllocCount;

+

 static void* CustomCpuAllocation(

     void* pUserData, size_t size, size_t alignment,

     VkSystemAllocationScope allocationScope)

 {

     assert(pUserData == CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA);

-    return _aligned_malloc(size, alignment);

+    void* const result = _aligned_malloc(size, alignment);

+    if(result)

+    {

+        ++g_CpuAllocCount;

+    }

+    return result;

 }

 

 static void* CustomCpuReallocation(

@@ -122,13 +130,27 @@
     VkSystemAllocationScope allocationScope)

 {

     assert(pUserData == CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA);

-    return _aligned_realloc(pOriginal, size, alignment);

+    void* const result = _aligned_realloc(pOriginal, size, alignment);

+    if(pOriginal && !result)

+    {

+        --g_CpuAllocCount;

+    }

+    else if(!pOriginal && result)

+    {

+        ++g_CpuAllocCount;

+    }

+    return result;

 }

 

 static void CustomCpuFree(void* pUserData, void* pMemory)

 {

     assert(pUserData == CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA);

-    _aligned_free(pMemory);

+    if(pMemory)

+    {

+        const uint32_t oldAllocCount = g_CpuAllocCount.fetch_sub(1);

+        TEST(oldAllocCount > 0);

+        _aligned_free(pMemory);

+    }

 }

 

 static const VkAllocationCallbacks g_CpuAllocationCallbacks = {

@@ -1836,6 +1858,8 @@
             DrawFrame();

     }

 

+    TEST(g_CpuAllocCount.load() == 0);

+

     return 0;

 }