Fixed tests for NVIDIA, where it asserted with OUT_OF_MEMORY, probably due to higher alignment requirements.

This commit is contained in:
Adam Sawicki 2018-10-03 15:57:11 +02:00
parent 2e4d3eff98
commit 4868c1f523

View File

@ -2199,9 +2199,9 @@ static void BenchmarkAlgorithmsCase(FILE* file,
if(!empty) if(!empty)
{ {
// Make allocations up to half of pool size. // Make allocations up to 1/3 of pool size.
VkDeviceSize totalSize = 0; VkDeviceSize totalSize = 0;
while(totalSize < poolCreateInfo.blockSize / 2) while(totalSize < poolCreateInfo.blockSize / 3)
{ {
memReq.size = bufSizeMin + rand.Generate() % (bufSizeMax - bufSizeMin); memReq.size = bufSizeMin + rand.Generate() % (bufSizeMax - bufSizeMin);
res = vmaAllocateMemory(g_hAllocator, &memReq, &allocCreateInfo, &alloc, nullptr); res = vmaAllocateMemory(g_hAllocator, &memReq, &allocCreateInfo, &alloc, nullptr);
@ -2221,7 +2221,7 @@ static void BenchmarkAlgorithmsCase(FILE* file,
} }
// BENCHMARK // BENCHMARK
const size_t allocCount = maxBufCapacity / 2; const size_t allocCount = maxBufCapacity / 3;
std::vector<VmaAllocation> testAllocations; std::vector<VmaAllocation> testAllocations;
testAllocations.reserve(allocCount); testAllocations.reserve(allocCount);
duration allocTotalDuration = duration::zero(); duration allocTotalDuration = duration::zero();
@ -2367,7 +2367,7 @@ static void BenchmarkAlgorithms(FILE* file)
BenchmarkAlgorithmsCase( BenchmarkAlgorithmsCase(
file, file,
algorithm, algorithm,
emptyIndex ? 0 : 1, // empty (emptyIndex == 0), // empty
strategy, strategy,
freeOrder); // freeOrder freeOrder); // freeOrder
} }