eden-emu/VulkanMemoryAllocator
15
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2025-05-25 14:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add changes requested in code review

Browse source
This commit is contained in:
Johannes Schneider 2025-04-01 17:08:03 +02:00
parent 1c0c2216b3
commit 2fdbc642c9
No known key found for this signature in database
1 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Tests.cpp
View file

@ -6161,7 +6161,7 @@ static void TestDataUploadingWithStagingBuffer()
const VkDeviceSize bufferSize = 65536; const VkDeviceSize bufferSize = 65536;
std::vector<std::uint8_t> bufferData(bufferSize); std::vector<std::uint8_t> bufferData(bufferSize);
for (auto& bufferByte : bufferData) { for (auto& bufferByte : bufferData) {
bufferByte = static_cast<std::uint8_t>(rand() % 256); bufferByte = static_cast<std::uint8_t>(rand());
} }
VkBufferCreateInfo uniformBufferCI = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; VkBufferCreateInfo uniformBufferCI = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
@ -6170,20 +6170,14 @@ static void TestDataUploadingWithStagingBuffer()
VmaAllocationCreateInfo uniformBufferAllocCI = {}; VmaAllocationCreateInfo uniformBufferAllocCI = {};
uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO; uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO;
uniformBufferAllocCI.flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
VkBuffer uniformBuffer = VK_NULL_HANDLE; VkBuffer uniformBuffer = VK_NULL_HANDLE;
VmaAllocation uniformBufferAlloc = {}; VmaAllocation uniformBufferAlloc = VK_NULL_HANDLE;
VmaAllocationInfo uniformBufferAllocInfo = {}; VmaAllocationInfo uniformBufferAllocInfo = {};
VkResult result = vmaCreateBuffer(g_hAllocator, &uniformBufferCI, &uniformBufferAllocCI, &uniformBuffer, &uniformBufferAlloc, &uniformBufferAllocInfo); VkResult result = vmaCreateBuffer(g_hAllocator, &uniformBufferCI, &uniformBufferAllocCI, &uniformBuffer, &uniformBufferAlloc, &uniformBufferAllocInfo);
TEST(result == VK_SUCCESS); TEST(result == VK_SUCCESS);
// We need to check if the uniform buffer really ended NOT up in mappable memory.
VkMemoryPropertyFlags memPropFlags;
vmaGetAllocationMemoryProperties(g_hAllocator, uniformBufferAlloc, &memPropFlags);
TEST(!(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
VkBufferCreateInfo stagingBufferCI = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; VkBufferCreateInfo stagingBufferCI = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
stagingBufferCI.size = bufferSize; stagingBufferCI.size = bufferSize;
stagingBufferCI.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; stagingBufferCI.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
@ -6200,10 +6194,7 @@ static void TestDataUploadingWithStagingBuffer()
TEST(result == VK_SUCCESS); TEST(result == VK_SUCCESS);
TEST(stagingBufferAllocInfo.pMappedData != nullptr); TEST(stagingBufferAllocInfo.pMappedData != nullptr);
std::memcpy(stagingBufferAllocInfo.pMappedData, bufferData.data(), bufferData.size()); vmaCopyMemoryToAllocation(g_hAllocator, bufferData.data(), stagingBufferAlloc, 0, bufferData.size());
result = vmaFlushAllocation(g_hAllocator, uniformBufferAlloc, 0, VK_WHOLE_SIZE);
TEST(result == VK_SUCCESS);
BeginSingleTimeCommands(); BeginSingleTimeCommands();
@ -6243,7 +6234,7 @@ static void TestDataUploadingWithStagingBuffer()
} }
static void TestDataUploadingWithMappedMemory() { static void TestDataUploadingWithMappedMemory() {
wprintf(L"Testing data uploading with mapped memory and memcpy...\n"); wprintf(L"Testing data uploading with mapped memory...\n");
// Generate some random data to fill the uniform buffer with. // Generate some random data to fill the uniform buffer with.
const VkDeviceSize bufferSize = 65536; const VkDeviceSize bufferSize = 65536;
@ -6258,10 +6249,10 @@ static void TestDataUploadingWithMappedMemory() {
VmaAllocationCreateInfo uniformBufferAllocCI = {}; VmaAllocationCreateInfo uniformBufferAllocCI = {};
uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO; uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO;
uniformBufferAllocCI.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT; // We want memory to be mapped so we can use memcpy to update it uniformBufferAllocCI.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT; // We want memory to be mapped.
VkBuffer uniformBuffer = VK_NULL_HANDLE; VkBuffer uniformBuffer = VK_NULL_HANDLE;
VmaAllocation uniformBufferAlloc = {}; VmaAllocation uniformBufferAlloc = VK_NULL_HANDLE;
VmaAllocationInfo uniformBufferAllocInfo = {}; VmaAllocationInfo uniformBufferAllocInfo = {};
VkResult result = vmaCreateBuffer(g_hAllocator, &uniformBufferCI, &uniformBufferAllocCI, &uniformBuffer, &uniformBufferAlloc, &uniformBufferAllocInfo); VkResult result = vmaCreateBuffer(g_hAllocator, &uniformBufferCI, &uniformBufferAllocCI, &uniformBuffer, &uniformBufferAlloc, &uniformBufferAllocInfo);
@ -6273,11 +6264,7 @@ static void TestDataUploadingWithMappedMemory() {
TEST(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); TEST(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
TEST(uniformBufferAllocInfo.pMappedData != nullptr); TEST(uniformBufferAllocInfo.pMappedData != nullptr);
std::memcpy(uniformBufferAllocInfo.pMappedData, bufferData.data(), bufferData.size()); vmaCopyMemoryToAllocation(g_hAllocator, bufferData.data(), uniformBufferAlloc, 0, bufferData.size());
// We don't need to check for VK_MEMORY_PROPERTY_HOST_COHERENT_BIT because both vmaFlushAllocation and vmaInvalidateAllocation check for this internally.
result = vmaFlushAllocation(g_hAllocator, uniformBufferAlloc, 0, VK_WHOLE_SIZE);
TEST(result == VK_SUCCESS);
BeginSingleTimeCommands(); BeginSingleTimeCommands();
@ -6313,7 +6300,8 @@ static void TestAdvancedDataUploading() {
VmaAllocationCreateInfo uniformBufferAllocCI = {}; VmaAllocationCreateInfo uniformBufferAllocCI = {};
uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO; uniformBufferAllocCI.usage = VMA_MEMORY_USAGE_AUTO;
uniformBufferAllocCI.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT; uniformBufferAllocCI.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT
| VMA_ALLOCATION_CREATE_MAPPED_BIT;
VkBuffer uniformBuffer = VK_NULL_HANDLE; VkBuffer uniformBuffer = VK_NULL_HANDLE;
VmaAllocation uniformBufferAlloc = {}; VmaAllocation uniformBufferAlloc = {};
@ -6326,13 +6314,9 @@ static void TestAdvancedDataUploading() {
vmaGetAllocationMemoryProperties(g_hAllocator, uniformBufferAlloc, &memPropFlags); vmaGetAllocationMemoryProperties(g_hAllocator, uniformBufferAlloc, &memPropFlags);
if (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) { if (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
// The allocation ended up as mapped memory, meaning we can update it simply by using std::memcpy. // The allocation ended up as mapped memory.
TEST(uniformBufferAllocInfo.pMappedData != nullptr); TEST(uniformBufferAllocInfo.pMappedData != nullptr);
std::memcpy(uniformBufferAllocInfo.pMappedData, bufferData.data(), bufferData.size()); vmaCopyMemoryToAllocation(g_hAllocator, bufferData.data(), uniformBufferAlloc, 0, bufferData.size());
// We don't need to check for VK_MEMORY_PROPERTY_HOST_COHERENT_BIT because both vmaFlushAllocation and vmaInvalidateAllocation check for this internally.
result = vmaFlushAllocation(g_hAllocator, uniformBufferAlloc, 0, VK_WHOLE_SIZE);
TEST(result == VK_SUCCESS);
BeginSingleTimeCommands(); BeginSingleTimeCommands();
@ -6367,7 +6351,7 @@ static void TestAdvancedDataUploading() {
TEST(result == VK_SUCCESS); TEST(result == VK_SUCCESS);
TEST(stagingBufferAllocInfo.pMappedData != nullptr); TEST(stagingBufferAllocInfo.pMappedData != nullptr);
std::memcpy(stagingBufferAllocInfo.pMappedData, bufferData.data(), bufferData.size()); vmaCopyMemoryToAllocation(g_hAllocator, bufferData.data(), stagingBufferAlloc, 0, bufferData.size());
result = vmaFlushAllocation(g_hAllocator, uniformBufferAlloc, 0, VK_WHOLE_SIZE); result = vmaFlushAllocation(g_hAllocator, uniformBufferAlloc, 0, VK_WHOLE_SIZE);
TEST(result == VK_SUCCESS); TEST(result == VK_SUCCESS);