AuroraMiddleware/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator synced 2024-11-05 12:20:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
Adam Sawicki 2020-07-16 16:41:53 +02:00
parent d594faafee
commit db4c1639bf
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Common.h
View File

@ -69,7 +69,6 @@ extern VkPhysicalDevice g_hPhysicalDevice;
extern VkDevice g_hDevice; extern VkDevice g_hDevice;
extern VkInstance g_hVulkanInstance; extern VkInstance g_hVulkanInstance;
extern VmaAllocator g_hAllocator; extern VmaAllocator g_hAllocator;
extern bool g_MemoryAliasingWarningEnabled;
extern bool VK_AMD_device_coherent_memory_enabled; extern bool VK_AMD_device_coherent_memory_enabled;
void SetAllocatorCreateInfo(VmaAllocatorCreateInfo& outInfo); void SetAllocatorCreateInfo(VmaAllocatorCreateInfo& outInfo);

13
src/Tests.cpp
View File

@ -1720,7 +1720,6 @@ void TestDefragmentationFull()
static void TestDefragmentationGpu() static void TestDefragmentationGpu()
{ {
wprintf(L"Test defragmentation GPU\n"); wprintf(L"Test defragmentation GPU\n");
g_MemoryAliasingWarningEnabled = false;
std::vector<AllocInfo> allocations; std::vector<AllocInfo> allocations;
@ -1854,8 +1853,6 @@ static void TestDefragmentationGpu()
{ {
allocations[i].Destroy(); allocations[i].Destroy();
} }
g_MemoryAliasingWarningEnabled = true;
} }
static void ProcessDefragmentationStepInfo(VmaDefragmentationPassInfo &stepInfo) static void ProcessDefragmentationStepInfo(VmaDefragmentationPassInfo &stepInfo)
@ -2043,7 +2040,6 @@ static void ProcessDefragmentationStepInfo(VmaDefragmentationPassInfo &stepInfo)
static void TestDefragmentationIncrementalBasic() static void TestDefragmentationIncrementalBasic()
{ {
wprintf(L"Test defragmentation incremental basic\n"); wprintf(L"Test defragmentation incremental basic\n");
g_MemoryAliasingWarningEnabled = false;
std::vector<AllocInfo> allocations; std::vector<AllocInfo> allocations;
@ -2223,14 +2219,11 @@ static void TestDefragmentationIncrementalBasic()
{ {
allocations[i].Destroy(); allocations[i].Destroy();
} }
g_MemoryAliasingWarningEnabled = true;
} }
void TestDefragmentationIncrementalComplex() void TestDefragmentationIncrementalComplex()
{ {
wprintf(L"Test defragmentation incremental complex\n"); wprintf(L"Test defragmentation incremental complex\n");
g_MemoryAliasingWarningEnabled = false;
std::vector<AllocInfo> allocations; std::vector<AllocInfo> allocations;
@ -2438,8 +2431,6 @@ void TestDefragmentationIncrementalComplex()
{ {
additionalAllocations[i].Destroy(); additionalAllocations[i].Destroy();
} }
g_MemoryAliasingWarningEnabled = true;
} }
@ -5583,10 +5574,8 @@ static void PerformCustomPoolTest(FILE* file)
config.TotalItemCount = config.UsedItemCountMax * 10; config.TotalItemCount = config.UsedItemCountMax * 10;
config.UsedItemCountMin = config.UsedItemCountMax * 80 / 100; config.UsedItemCountMin = config.UsedItemCountMax * 80 / 100;
g_MemoryAliasingWarningEnabled = false;
PoolTestResult result = {}; PoolTestResult result = {};
TestPool_Benchmark(result, config); TestPool_Benchmark(result, config);
g_MemoryAliasingWarningEnabled = true;
WritePoolTestResult(file, "Code desc", "Test desc", config, result); WritePoolTestResult(file, "Code desc", "Test desc", config, result);
} }
@ -6070,9 +6059,7 @@ static void PerformPoolTests(FILE* file)
printf("%s #%u\n", testDescription, (uint32_t)repeat); printf("%s #%u\n", testDescription, (uint32_t)repeat);
PoolTestResult result{}; PoolTestResult result{};
g_MemoryAliasingWarningEnabled = false;
TestPool_Benchmark(result, config); TestPool_Benchmark(result, config);
g_MemoryAliasingWarningEnabled = true;
WritePoolTestResult(file, CODE_DESCRIPTION, testDescription, config, result); WritePoolTestResult(file, CODE_DESCRIPTION, testDescription, config, result);
} }
} }