e24e58f293
This PR adds recycling of descriptor pools. Currently descriptor pools are discarded when full or context is flushed. This PR allows descriptor pools to be discarded for reuse. It is also more conservative and only discard Descriptor pools when they are full or fragmented. When using the Vulkan backend a small amount of descriptor memory can leak. Even when we clean up all resources, drivers can still keep data around on the GPU. Eventually this can lead to out of memory issues depending on how the GPU driver actually manages descriptor sets. When the descriptor sets of the descriptor pool aren't used anymore the VKDiscardPool will recycle the pools back to its original VKDescriptorPools. It needs to be the same instance as descriptor pools/sets are owned by a single thread. Pull Request: https://projects.blender.org/blender/blender/pulls/144992
103 lines
3.3 KiB
C++
103 lines
3.3 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup gpu
|
|
*/
|
|
|
|
#include "vk_descriptor_pools.hh"
|
|
#include "vk_backend.hh"
|
|
#include "vk_context.hh"
|
|
#include "vk_device.hh"
|
|
|
|
namespace blender::gpu {
|
|
|
|
VKDescriptorPools::~VKDescriptorPools()
|
|
{
|
|
const VKDevice &device = VKBackend::get().device;
|
|
for (const VkDescriptorPool vk_descriptor_pool : recycled_pools_) {
|
|
vkDestroyDescriptorPool(device.vk_handle(), vk_descriptor_pool, nullptr);
|
|
}
|
|
recycled_pools_.clear();
|
|
if (vk_descriptor_pool_ != VK_NULL_HANDLE) {
|
|
vkDestroyDescriptorPool(device.vk_handle(), vk_descriptor_pool_, nullptr);
|
|
vk_descriptor_pool_ = VK_NULL_HANDLE;
|
|
}
|
|
}
|
|
|
|
void VKDescriptorPools::init(const VKDevice &device)
|
|
{
|
|
ensure_pool(device);
|
|
}
|
|
|
|
void VKDescriptorPools::ensure_pool(const VKDevice &device)
|
|
{
|
|
if (vk_descriptor_pool_ != VK_NULL_HANDLE) {
|
|
return;
|
|
}
|
|
|
|
std::scoped_lock lock(mutex_);
|
|
if (!recycled_pools_.is_empty()) {
|
|
vk_descriptor_pool_ = recycled_pools_.pop_last();
|
|
return;
|
|
}
|
|
|
|
Vector<VkDescriptorPoolSize> pool_sizes = {
|
|
{VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, POOL_SIZE_STORAGE_BUFFER},
|
|
{VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, POOL_SIZE_STORAGE_IMAGE},
|
|
{VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, POOL_SIZE_COMBINED_IMAGE_SAMPLER},
|
|
{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, POOL_SIZE_UNIFORM_BUFFER},
|
|
{VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, POOL_SIZE_UNIFORM_TEXEL_BUFFER},
|
|
{VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, POOL_SIZE_INPUT_ATTACHMENT}};
|
|
VkDescriptorPoolCreateInfo pool_info = {};
|
|
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
|
|
pool_info.maxSets = POOL_SIZE_DESCRIPTOR_SETS;
|
|
pool_info.poolSizeCount = pool_sizes.size();
|
|
pool_info.pPoolSizes = pool_sizes.data();
|
|
vkCreateDescriptorPool(device.vk_handle(), &pool_info, nullptr, &vk_descriptor_pool_);
|
|
}
|
|
|
|
void VKDescriptorPools::discard_active_pool(VKContext &context)
|
|
{
|
|
context.discard_pool.discard_descriptor_pool_for_reuse(vk_descriptor_pool_, this);
|
|
vk_descriptor_pool_ = VK_NULL_HANDLE;
|
|
}
|
|
|
|
void VKDescriptorPools::recycle(VkDescriptorPool vk_descriptor_pool)
|
|
{
|
|
const VKDevice &device = VKBackend::get().device;
|
|
vkResetDescriptorPool(device.vk_handle(), vk_descriptor_pool, 0);
|
|
std::scoped_lock lock(mutex_);
|
|
recycled_pools_.append(vk_descriptor_pool);
|
|
}
|
|
|
|
VkDescriptorSet VKDescriptorPools::allocate(const VkDescriptorSetLayout descriptor_set_layout)
|
|
{
|
|
BLI_assert(descriptor_set_layout != VK_NULL_HANDLE);
|
|
BLI_assert(vk_descriptor_pool_ != VK_NULL_HANDLE);
|
|
const VKDevice &device = VKBackend::get().device;
|
|
|
|
VkDescriptorSetAllocateInfo allocate_info = {};
|
|
allocate_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
|
|
allocate_info.descriptorPool = vk_descriptor_pool_;
|
|
allocate_info.descriptorSetCount = 1;
|
|
allocate_info.pSetLayouts = &descriptor_set_layout;
|
|
VkDescriptorSet vk_descriptor_set = VK_NULL_HANDLE;
|
|
VkResult result = vkAllocateDescriptorSets(
|
|
device.vk_handle(), &allocate_info, &vk_descriptor_set);
|
|
|
|
if (ELEM(result, VK_ERROR_OUT_OF_POOL_MEMORY, VK_ERROR_FRAGMENTED_POOL)) {
|
|
{
|
|
VKContext &context = *VKContext::get();
|
|
discard_active_pool(context);
|
|
ensure_pool(device);
|
|
}
|
|
return allocate(descriptor_set_layout);
|
|
}
|
|
|
|
return vk_descriptor_set;
|
|
}
|
|
|
|
} // namespace blender::gpu
|