preserve-emulation/simple64
1
0
Fork 0
mirror of https://github.com/simple64/simple64.git synced 2026-09-07 04:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

update parallel rdp

Browse Source
This commit is contained in:
Logan McNaughton
2021-08-09 15:51:33 -06:00
parent 6705d5e44e
commit 19445a0df4
62 changed files with 110819 additions and 53611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel-rdp-standalone/vulkan/memory_allocator.cpp
+62
View File
@@ -387,6 +387,51 @@ void DeviceAllocator::init(Device *device_)
HeapBudget budgets[VK_MAX_MEMORY_HEAPS];
get_memory_budget(budgets);
// Figure out if we have a PCI-e BAR heap.
// We need to be very careful with our budget (usually 128 MiB out of 256 MiB) on these heaps
// since they can lead to instability if overused.
VkMemoryPropertyFlags combined_allowed_flags[VK_MAX_MEMORY_HEAPS] = {};
for (uint32_t i = 0; i < mem_props.memoryTypeCount; i++)
{
uint32_t heap_index = mem_props.memoryTypes[i].heapIndex;
combined_allowed_flags[heap_index] |= mem_props.memoryTypes[i].propertyFlags;
}
bool has_host_only_heap = false;
bool has_device_only_heap = false;
VkDeviceSize host_heap_size = 0;
VkDeviceSize device_heap_size = 0;
const VkMemoryPropertyFlags pinned_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
for (uint32_t i = 0; i < mem_props.memoryHeapCount; i++)
{
if ((combined_allowed_flags[i] & pinned_flags) == VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)
{
has_host_only_heap = true;
host_heap_size = (std::max)(host_heap_size, mem_props.memoryHeaps[i].size);
}
else if ((combined_allowed_flags[i] & pinned_flags) == VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
{
has_device_only_heap = true;
device_heap_size = (std::max)(device_heap_size, mem_props.memoryHeaps[i].size);
}
}
// If we have ReBAR enabled, we generally won't find DEVICE only and HOST only heaps.
// Budget criticalness should only be considered if we have the default small BAR heap (256 MiB).
if (has_host_only_heap && has_device_only_heap)
{
for (uint32_t i = 0; i < mem_props.memoryHeapCount; i++)
{
if ((combined_allowed_flags[i] & pinned_flags) == pinned_flags &&
mem_props.memoryHeaps[i].size < host_heap_size &&
mem_props.memoryHeaps[i].size < device_heap_size)
{
memory_heap_is_budget_critical[i] = true;
}
}
}
}
bool DeviceAllocator::allocate(uint32_t size, uint32_t alignment, AllocationMode mode, uint32_t memory_type,
@@ -447,7 +492,10 @@ void DeviceAllocator::free(uint32_t size, uint32_t memory_type, AllocationMode m
auto &heap = heaps[mem_props.memoryTypes[memory_type].heapIndex];
VK_ASSERT(mode != AllocationMode::Count);
heap.blocks.push_back({ memory, size, memory_type, mode });
if (memory_heap_is_budget_critical[mem_props.memoryTypes[memory_type].heapIndex])
heap.garbage_collect(device);
}
void DeviceAllocator::free_no_recycle(uint32_t size, uint32_t memory_type, VkDeviceMemory memory)
@@ -619,16 +667,30 @@ bool DeviceAllocator::allocate(uint32_t size, uint32_t memory_type, AllocationMo
double(budgets[heap_index].max_size) / double(1024 * 1024));
#endif
const auto log_heap_index = [&]() {
LOGW(" Size: %u MiB.\n", unsigned(size / (1024 * 1024)));
LOGW(" Device usage: %u MiB.\n", unsigned(budgets[heap_index].device_usage / (1024 * 1024)));
LOGW(" Tracked usage: %u MiB.\n", unsigned(budgets[heap_index].tracked_usage / (1024 * 1024)));
LOGW(" Budget size: %u MiB.\n", unsigned(budgets[heap_index].budget_size / (1024 * 1024)));
LOGW(" Max size: %u MiB.\n", unsigned(budgets[heap_index].max_size / (1024 * 1024)));
};
// If we're going to blow out the budget, we should recycle a bit.
if (budgets[heap_index].device_usage + size >= budgets[heap_index].budget_size)
{
LOGW("Will exceed memory budget, cleaning up ...\n");
log_heap_index();
heap.garbage_collect(device);
}
get_memory_budget_nolock(budgets);
if (budgets[heap_index].device_usage + size >= budgets[heap_index].budget_size)
{
LOGW("Even after garbage collection, we will exceed budget ...\n");
if (memory_heap_is_budget_critical[heap_index])
return false;
log_heap_index();
}
VkMemoryAllocateInfo info = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, nullptr, size, memory_type };
VkMemoryDedicatedAllocateInfoKHR dedicated = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };