58b0ae84b5
This reworks how host<->device synchronization works on the Vulkan backend. Instead of "protecting" resources with a fence and signalling these as free when the fence is known to be signalled by the host GPU, use timeline semaphores. Vulkan timeline semaphores allow use to work on a subset of D3D12 fences. As far as we are concerned, timeline semaphores are a value set by the host or the device that can be waited by either of them. Taking advantange of this, we can have a monolithically increasing atomic value for each submission to the graphics queue. Instead of protecting resources with a fence, we simply store the current logical tick (the atomic value stored in CPU memory). When we want to know if a resource is free, it can be compared to the current GPU tick. This greatly simplifies resource management code and the free status of resources should have less false negatives. To workaround bugs in validation layers, when these are attached there's a thread waiting for timeline semaphores.
91 lines
3.6 KiB
C++
91 lines
3.6 KiB
C++
// Copyright 2019 yuzu Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <vector>
|
|
|
|
#include "common/common_types.h"
|
|
#include "video_core/renderer_vulkan/vk_descriptor_pool.h"
|
|
#include "video_core/renderer_vulkan/vk_device.h"
|
|
#include "video_core/renderer_vulkan/vk_resource_pool.h"
|
|
#include "video_core/renderer_vulkan/vk_scheduler.h"
|
|
#include "video_core/renderer_vulkan/wrapper.h"
|
|
|
|
namespace Vulkan {
|
|
|
|
// Prefer small grow rates to avoid saturating the descriptor pool with barely used pipelines.
|
|
constexpr std::size_t SETS_GROW_RATE = 0x20;
|
|
|
|
DescriptorAllocator::DescriptorAllocator(VKDescriptorPool& descriptor_pool_,
|
|
VkDescriptorSetLayout layout_)
|
|
: ResourcePool(descriptor_pool_.master_semaphore, SETS_GROW_RATE),
|
|
descriptor_pool{descriptor_pool_}, layout{layout_} {}
|
|
|
|
DescriptorAllocator::~DescriptorAllocator() = default;
|
|
|
|
VkDescriptorSet DescriptorAllocator::Commit() {
|
|
const std::size_t index = CommitResource();
|
|
return descriptors_allocations[index / SETS_GROW_RATE][index % SETS_GROW_RATE];
|
|
}
|
|
|
|
void DescriptorAllocator::Allocate(std::size_t begin, std::size_t end) {
|
|
descriptors_allocations.push_back(descriptor_pool.AllocateDescriptors(layout, end - begin));
|
|
}
|
|
|
|
VKDescriptorPool::VKDescriptorPool(const VKDevice& device_, VKScheduler& scheduler)
|
|
: device{device_}, master_semaphore{scheduler.GetMasterSemaphore()}, active_pool{
|
|
AllocateNewPool()} {}
|
|
|
|
VKDescriptorPool::~VKDescriptorPool() = default;
|
|
|
|
vk::DescriptorPool* VKDescriptorPool::AllocateNewPool() {
|
|
static constexpr u32 num_sets = 0x20000;
|
|
static constexpr VkDescriptorPoolSize pool_sizes[] = {
|
|
{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, num_sets * 90},
|
|
{VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, num_sets * 60},
|
|
{VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, num_sets * 64},
|
|
{VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, num_sets * 64},
|
|
{VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, num_sets * 64},
|
|
{VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, num_sets * 40},
|
|
};
|
|
|
|
const VkDescriptorPoolCreateInfo ci{
|
|
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
|
|
.pNext = nullptr,
|
|
.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
|
|
.maxSets = num_sets,
|
|
.poolSizeCount = static_cast<u32>(std::size(pool_sizes)),
|
|
.pPoolSizes = std::data(pool_sizes),
|
|
};
|
|
return &pools.emplace_back(device.GetLogical().CreateDescriptorPool(ci));
|
|
}
|
|
|
|
vk::DescriptorSets VKDescriptorPool::AllocateDescriptors(VkDescriptorSetLayout layout,
|
|
std::size_t count) {
|
|
const std::vector layout_copies(count, layout);
|
|
VkDescriptorSetAllocateInfo ai{
|
|
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
|
|
.pNext = nullptr,
|
|
.descriptorPool = **active_pool,
|
|
.descriptorSetCount = static_cast<u32>(count),
|
|
.pSetLayouts = layout_copies.data(),
|
|
};
|
|
|
|
vk::DescriptorSets sets = active_pool->Allocate(ai);
|
|
if (!sets.IsOutOfPoolMemory()) {
|
|
return sets;
|
|
}
|
|
|
|
// Our current pool is out of memory. Allocate a new one and retry
|
|
active_pool = AllocateNewPool();
|
|
ai.descriptorPool = **active_pool;
|
|
sets = active_pool->Allocate(ai);
|
|
if (!sets.IsOutOfPoolMemory()) {
|
|
return sets;
|
|
}
|
|
|
|
// After allocating a new pool, we are out of memory again. We can't handle this from here.
|
|
throw vk::Exception(VK_ERROR_OUT_OF_POOL_MEMORY);
|
|
}
|
|
|
|
} // namespace Vulkan
|