AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-23 04:40:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed TestDefragmentationGpu() - it was test that was buggy. Defragmentation of GPU memory is working!!! - a major milestone :D

Browse Source
This commit is contained in:
Adam Sawicki 2018-10-18 15:05:19 +02:00
parent ff0f7b8254
commit 440307e6bc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Tests.cpp
View File

@ -1460,7 +1460,9 @@ static void TestDefragmentationGpu()
VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
bufCreateInfo.size = bufSize; bufCreateInfo.size = bufSize;
bufCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; bufCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT |
VK_BUFFER_USAGE_TRANSFER_DST_BIT |
VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
VmaAllocationCreateInfo allocCreateInfo = {}; VmaAllocationCreateInfo allocCreateInfo = {};
allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY;
@ -1495,20 +1497,22 @@ static void TestDefragmentationGpu()
// Defragment using GPU only. // Defragment using GPU only.
{ {
const size_t allocCount = allocations.size(); const size_t allocCount = allocations.size();
std::vector<VmaAllocation> allocationPtrs(allocCount); std::vector<VmaAllocation> allocationPtrs(allocCount);
std::vector<VkBool32> allocationChanged(allocCount); std::vector<VkBool32> allocationChanged(allocCount);
for(size_t i = 0; i < allocCount; ++i) for(size_t i = 0; i < allocCount; ++i)
{ {
allocationPtrs[i] = allocations[i].m_Allocation; allocationPtrs[i] = allocations[i].m_Allocation;
allocationChanged[i] = VK_FALSE;
} }
memset(allocationChanged.data(), 0, allocCount * sizeof(VkBool32));
BeginSingleTimeCommands(); BeginSingleTimeCommands();
VmaDefragmentationInfo2 defragInfo = {}; VmaDefragmentationInfo2 defragInfo = {};
defragInfo.allocationCount = (uint32_t)allocCount; defragInfo.allocationCount = (uint32_t)allocCount;
defragInfo.pAllocations = allocationPtrs.data(); defragInfo.pAllocations = allocationPtrs.data();
defragInfo.maxGpuBytesToMove = 0;//VK_WHOLE_SIZE; defragInfo.pAllocationsChanged = allocationChanged.data();
defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE;
defragInfo.maxGpuAllocationsToMove = UINT32_MAX; defragInfo.maxGpuAllocationsToMove = UINT32_MAX;
defragInfo.commandBuffer = g_hTemporaryCommandBuffer; defragInfo.commandBuffer = g_hTemporaryCommandBuffer;
@ -1529,9 +1533,9 @@ static void TestDefragmentationGpu()
} }
} }
//TEST(stats.allocationsMoved > 0 && stats.bytesMoved > 0); TEST(stats.allocationsMoved > 0 && stats.bytesMoved > 0);
//TEST(stats.deviceMemoryBlocksFreed > 0 && stats.bytesFreed > 0); TEST(stats.deviceMemoryBlocksFreed > 0 && stats.bytesFreed > 0);
//TEST(stats.allocationsLost == 0); TEST(stats.allocationsLost == 0);
} }
ValidateGpuData(allocations.data(), allocations.size()); ValidateGpuData(allocations.data(), allocations.size());
@ -4686,8 +4690,6 @@ void Test()
// ######################################## // ########################################
TestDefragmentationGpu(); TestDefragmentationGpu();
TestDefragmentationSimple();
TestDefragmentationFull();
return; return;
} }