lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add test to ensure vkBindBufferMemory2 can be split up

Browse Source
This commit is contained in:
baldurk
2021-01-13 14:48:40 +00:00
parent f5a99d47a2
commit 92192ef348
1 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/vk/vk_parameter_zoo.cpp
+50 -4
View File
@@ -225,6 +225,7 @@ void main()
optDevExts.push_back(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
optDevExts.push_back(VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME);
optDevExts.push_back(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME);
optDevExts.push_back(VK_KHR_BIND_MEMORY_2_EXTENSION_NAME);
VulkanGraphicsTest::Prepare(argc, argv);
@@ -584,10 +585,55 @@ void main()
vkDestroyPipeline(device, dummy, NULL);
}
AllocatedBuffer vb(
this, vkh::BufferCreateInfo(sizeof(DefaultTri), VK_BUFFER_USAGE_VERTEX_BUFFER_BIT |
VK_BUFFER_USAGE_TRANSFER_DST_BIT),
VmaAllocationCreateInfo({0, VMA_MEMORY_USAGE_CPU_TO_GPU}));
AllocatedBuffer vb;
if(std::find(devExts.begin(), devExts.end(), VK_KHR_BIND_MEMORY_2_EXTENSION_NAME) != devExts.end())
{
// if we have bind memory 2, try to bind two buffers simultaneously in one call and delete the
// other buffer. This ensure we don't try to bind an invalid buffer on replay.
VkBuffer tmp = VK_NULL_HANDLE;
VmaAllocation tmpAlloc = {};
vkCreateBuffer(device,
vkh::BufferCreateInfo(sizeof(DefaultTri), VK_BUFFER_USAGE_VERTEX_BUFFER_BIT |
VK_BUFFER_USAGE_TRANSFER_DST_BIT),
NULL, &vb.buffer);
vkCreateBuffer(device,
vkh::BufferCreateInfo(sizeof(DefaultTri), VK_BUFFER_USAGE_VERTEX_BUFFER_BIT |
VK_BUFFER_USAGE_TRANSFER_DST_BIT),
NULL, &tmp);
VmaAllocationCreateInfo allocInfo = {0, VMA_MEMORY_USAGE_CPU_TO_GPU};
VmaAllocationInfo vbInfo, tmpInfo;
vmaAllocateMemoryForBuffer(allocator, vb.buffer, &allocInfo, &vb.alloc, &vbInfo);
vmaAllocateMemoryForBuffer(allocator, tmp, &allocInfo, &tmpAlloc, &tmpInfo);
VkBindBufferMemoryInfoKHR binds[2] = {};
binds[0].sType = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR;
binds[0].buffer = vb.buffer;
binds[0].memory = vbInfo.deviceMemory;
binds[0].memoryOffset = vbInfo.offset;
binds[1].sType = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR;
binds[1].buffer = tmp;
binds[1].memory = tmpInfo.deviceMemory;
binds[1].memoryOffset = tmpInfo.offset;
vkBindBufferMemory2KHR(device, 2, binds);
vmaFreeMemory(allocator, tmpAlloc);
vkDestroyBuffer(device, tmp, NULL);
vb.allocator = allocator;
bufferAllocs[vb.buffer] = vb.alloc;
}
else
{
vb = AllocatedBuffer(
this, vkh::BufferCreateInfo(sizeof(DefaultTri), VK_BUFFER_USAGE_VERTEX_BUFFER_BIT |
VK_BUFFER_USAGE_TRANSFER_DST_BIT),
VmaAllocationCreateInfo({0, VMA_MEMORY_USAGE_CPU_TO_GPU}));
}
vb.upload(DefaultTri);