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

Added optional usage of VmaAllocatorCreateInfo::pAllocationCallbacks (disabled by default).

Browse Source
This commit is contained in:
Adam Sawicki 2018-03-13 16:40:45 +01:00
parent 6cc5e859ea
commit a68c01c85e
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/VulkanSample_Release_vs2015.exe
View File

Binary file not shown.

39
src/VulkanSample.cpp
View File

@ -35,14 +35,15 @@ static const wchar_t* const APP_TITLE_W = L"Vulkan Memory Allocator Sample 2.0";
static const bool VSYNC = true; static const bool VSYNC = true;
static const uint32_t COMMAND_BUFFER_COUNT = 2; static const uint32_t COMMAND_BUFFER_COUNT = 2;
static void* const CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA = (void*)(intptr_t)43564544;
static bool g_EnableValidationLayer = true; static const bool USE_CUSTOM_CPU_ALLOCATION_CALLBACKS = false;
VkPhysicalDevice g_hPhysicalDevice; VkPhysicalDevice g_hPhysicalDevice;
VkDevice g_hDevice; VkDevice g_hDevice;
VmaAllocator g_hAllocator; VmaAllocator g_hAllocator;
bool g_MemoryAliasingWarningEnabled = true; bool g_MemoryAliasingWarningEnabled = true;
static bool g_EnableValidationLayer = true;
static bool VK_KHR_get_memory_requirements2_enabled = false; static bool VK_KHR_get_memory_requirements2_enabled = false;
static bool VK_KHR_dedicated_allocation_enabled = false; static bool VK_KHR_dedicated_allocation_enabled = false;
@ -102,6 +103,28 @@ static VkImage g_hTextureImage;
static VmaAllocation g_hTextureImageAlloc; static VmaAllocation g_hTextureImageAlloc;
static VkImageView g_hTextureImageView; static VkImageView g_hTextureImageView;
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);
}
static void* CustomCpuReallocation(
void* pUserData, void* pOriginal, size_t size, size_t alignment,
VkSystemAllocationScope allocationScope)
{
assert(pUserData == CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA);
return _aligned_realloc(pOriginal, size, alignment);
}
static void CustomCpuFree(void* pUserData, void* pMemory)
{
assert(pUserData == CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA);
_aligned_free(pMemory);
}
static void BeginSingleTimeCommands() static void BeginSingleTimeCommands()
{ {
VkCommandBufferBeginInfo cmdBufBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO }; VkCommandBufferBeginInfo cmdBufBeginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
@ -1255,10 +1278,22 @@ static void InitializeApplication()
VmaAllocatorCreateInfo allocatorInfo = {}; VmaAllocatorCreateInfo allocatorInfo = {};
allocatorInfo.physicalDevice = g_hPhysicalDevice; allocatorInfo.physicalDevice = g_hPhysicalDevice;
allocatorInfo.device = g_hDevice; allocatorInfo.device = g_hDevice;
if(VK_KHR_dedicated_allocation_enabled) if(VK_KHR_dedicated_allocation_enabled)
{ {
allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT; allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;
} }
VkAllocationCallbacks cpuAllocationCallbacks = {};
if(USE_CUSTOM_CPU_ALLOCATION_CALLBACKS)
{
cpuAllocationCallbacks.pUserData = CUSTOM_CPU_ALLOCATION_CALLBACK_USER_DATA;
cpuAllocationCallbacks.pfnAllocation = &CustomCpuAllocation;
cpuAllocationCallbacks.pfnReallocation = &CustomCpuReallocation;
cpuAllocationCallbacks.pfnFree = &CustomCpuFree;
allocatorInfo.pAllocationCallbacks = &cpuAllocationCallbacks;
}
ERR_GUARD_VULKAN( vmaCreateAllocator(&allocatorInfo, &g_hAllocator) ); ERR_GUARD_VULKAN( vmaCreateAllocator(&allocatorInfo, &g_hAllocator) );
// Retrieve queue (doesn't need to be destroyed) // Retrieve queue (doesn't need to be destroyed)