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

Fix in VmaBlockMetadata_Linear::CreateAllocationRequest for too large allocations

Browse Source 
Fixes #396 - thanks @dm-tesla
This commit is contained in:
Adam Sawicki 2024-02-23 17:28:22 +01:00
parent 9b7687761a
commit f1ab507d00
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vk_mem_alloc.h
View File

@ -7808,6 +7808,10 @@ bool VmaBlockMetadata_Linear::CreateAllocationRequest(
VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);
VMA_ASSERT(pAllocationRequest != VMA_NULL); VMA_ASSERT(pAllocationRequest != VMA_NULL);
VMA_HEAVY_ASSERT(Validate()); VMA_HEAVY_ASSERT(Validate());
if(allocSize > GetSize())
return false;
pAllocationRequest->size = allocSize; pAllocationRequest->size = allocSize;
return upperAddress ? return upperAddress ?
CreateAllocationRequest_UpperAddress( CreateAllocationRequest_UpperAddress(

8
src/Tests.cpp
View File

@ -3425,6 +3425,14 @@ static void TestVirtualBlocksAlgorithms()
}; };
std::vector<AllocData> allocations; std::vector<AllocData> allocations;
// Test too large allocation
{
VmaVirtualAllocationCreateInfo allocCreateInfo = {};
allocCreateInfo.size = blockCreateInfo.size * 2;
VmaVirtualAllocation alloc;
TEST(vmaVirtualAllocate(block, &allocCreateInfo, &alloc, nullptr) < 0);
}
// Make some allocations // Make some allocations
for(size_t i = 0; i < 20; ++i) for(size_t i = 0; i < 20; ++i)
{ {