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

Changed macro in defragmentation test to more readable lambda.

Browse Source 
Code by @medranSolus
This commit is contained in:
Adam Sawicki 2022-03-14 14:21:59 +01:00
parent c317c7b3e8
commit 58face4cff
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Tests.cpp
View File

@ -2716,18 +2716,20 @@ void TestDefragmentationIncrementalComplex()
std::vector<AllocInfo> additionalAllocations; std::vector<AllocInfo> additionalAllocations;
additionalAllocations.reserve(maxAdditionalAllocations); additionalAllocations.reserve(maxAdditionalAllocations);
#define MakeAdditionalAllocation() \ const auto makeAdditionalAllocation = [&]()
if (additionalAllocations.size() < maxAdditionalAllocations) \ {
{ \ if (additionalAllocations.size() < maxAdditionalAllocations)
bufCreateInfo.size = align_up<VkDeviceSize>(bufSizeMin + rand.Generate() % (bufSizeMax - bufSizeMin), 16); \ {
bufCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT; \ bufCreateInfo.size = align_up<VkDeviceSize>(bufSizeMin + rand.Generate() % (bufSizeMax - bufSizeMin), 16);
\ bufCreateInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
AllocInfo alloc; \
alloc.CreateBuffer(bufCreateInfo, allocCreateInfo); \ AllocInfo alloc;
\ alloc.CreateBuffer(bufCreateInfo, allocCreateInfo);
additionalAllocations.push_back(alloc); \
vmaSetAllocationUserData(g_hAllocator, alloc.m_Allocation, &additionalAllocations.back()); \ additionalAllocations.push_back(alloc);
vmaSetAllocationUserData(g_hAllocator, alloc.m_Allocation, &additionalAllocations.back());
} }
};
// Defragment using GPU only. // Defragment using GPU only.
{ {
@ -2738,12 +2740,12 @@ void TestDefragmentationIncrementalComplex()
VkResult res = vmaBeginDefragmentation(g_hAllocator, &defragInfo, &ctx); VkResult res = vmaBeginDefragmentation(g_hAllocator, &defragInfo, &ctx);
TEST(res == VK_SUCCESS); TEST(res == VK_SUCCESS);
MakeAdditionalAllocation(); makeAdditionalAllocation();
VmaDefragmentationPassMoveInfo pass = {}; VmaDefragmentationPassMoveInfo pass = {};
while((res = vmaBeginDefragmentationPass(g_hAllocator, ctx, &pass)) == VK_INCOMPLETE) while((res = vmaBeginDefragmentationPass(g_hAllocator, ctx, &pass)) == VK_INCOMPLETE)
{ {
MakeAdditionalAllocation(); makeAdditionalAllocation();
// Ignore data outside of test // Ignore data outside of test
for (uint32_t i = 0; i < pass.moveCount; ++i) for (uint32_t i = 0; i < pass.moveCount; ++i)
@ -2761,7 +2763,7 @@ void TestDefragmentationIncrementalComplex()
ProcessDefragmentationPass(pass); ProcessDefragmentationPass(pass);
EndSingleTimeCommands(); EndSingleTimeCommands();
MakeAdditionalAllocation(); makeAdditionalAllocation();
// Destroy old buffers/images and replace them with new handles. // Destroy old buffers/images and replace them with new handles.
for (size_t i = 0; i < pass.moveCount; ++i) for (size_t i = 0; i < pass.moveCount; ++i)
@ -2796,7 +2798,7 @@ void TestDefragmentationIncrementalComplex()
break; break;
TEST(res == VK_INCOMPLETE); TEST(res == VK_INCOMPLETE);
MakeAdditionalAllocation(); makeAdditionalAllocation();
} }
TEST(res == VK_SUCCESS); TEST(res == VK_SUCCESS);