481c8fd5a7
When exiting the immediate buffers are discarded, but where not destroyed making the buffers still leak. Detected when looking into descriptor set freeze issue. Pull Request: https://projects.blender.org/blender/blender/pulls/128249
117 lines
3.2 KiB
C++
117 lines
3.2 KiB
C++
/* SPDX-FileCopyrightText: 2024 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup gpu
|
|
*/
|
|
|
|
#include "vk_resource_pool.hh"
|
|
#include "vk_backend.hh"
|
|
#include "vk_memory.hh"
|
|
|
|
namespace blender::gpu {
|
|
|
|
void VKResourcePool::init(VKDevice &device)
|
|
{
|
|
descriptor_pools.init(device);
|
|
}
|
|
|
|
void VKResourcePool::deinit(VKDevice &device)
|
|
{
|
|
immediate.deinit(device);
|
|
discard_pool.deinit(device);
|
|
}
|
|
|
|
void VKResourcePool::reset()
|
|
{
|
|
descriptor_pools.reset();
|
|
immediate.reset();
|
|
}
|
|
|
|
void VKDiscardPool::deinit(VKDevice &device)
|
|
{
|
|
destroy_discarded_resources(device);
|
|
}
|
|
|
|
void VKDiscardPool::move_data(VKDiscardPool &src_pool)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
std::scoped_lock mutex_src(src_pool.mutex_);
|
|
buffers_.extend(src_pool.buffers_);
|
|
image_views_.extend(src_pool.image_views_);
|
|
images_.extend(src_pool.images_);
|
|
shader_modules_.extend(src_pool.shader_modules_);
|
|
pipeline_layouts_.extend(src_pool.pipeline_layouts_);
|
|
src_pool.buffers_.clear();
|
|
src_pool.image_views_.clear();
|
|
src_pool.images_.clear();
|
|
src_pool.shader_modules_.clear();
|
|
src_pool.pipeline_layouts_.clear();
|
|
}
|
|
|
|
void VKDiscardPool::discard_image(VkImage vk_image, VmaAllocation vma_allocation)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
images_.append(std::pair(vk_image, vma_allocation));
|
|
}
|
|
|
|
void VKDiscardPool::discard_image_view(VkImageView vk_image_view)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
image_views_.append(vk_image_view);
|
|
}
|
|
|
|
void VKDiscardPool::discard_buffer(VkBuffer vk_buffer, VmaAllocation vma_allocation)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
buffers_.append(std::pair(vk_buffer, vma_allocation));
|
|
}
|
|
|
|
void VKDiscardPool::discard_shader_module(VkShaderModule vk_shader_module)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
shader_modules_.append(vk_shader_module);
|
|
}
|
|
void VKDiscardPool::discard_pipeline_layout(VkPipelineLayout vk_pipeline_layout)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
pipeline_layouts_.append(vk_pipeline_layout);
|
|
}
|
|
|
|
void VKDiscardPool::destroy_discarded_resources(VKDevice &device)
|
|
{
|
|
std::scoped_lock mutex(mutex_);
|
|
VK_ALLOCATION_CALLBACKS
|
|
|
|
while (!image_views_.is_empty()) {
|
|
VkImageView vk_image_view = image_views_.pop_last();
|
|
vkDestroyImageView(device.vk_handle(), vk_image_view, vk_allocation_callbacks);
|
|
}
|
|
|
|
while (!images_.is_empty()) {
|
|
std::pair<VkImage, VmaAllocation> image_allocation = images_.pop_last();
|
|
device.resources.remove_image(image_allocation.first);
|
|
vmaDestroyImage(device.mem_allocator_get(), image_allocation.first, image_allocation.second);
|
|
}
|
|
|
|
while (!buffers_.is_empty()) {
|
|
std::pair<VkBuffer, VmaAllocation> buffer_allocation = buffers_.pop_last();
|
|
device.resources.remove_buffer(buffer_allocation.first);
|
|
vmaDestroyBuffer(
|
|
device.mem_allocator_get(), buffer_allocation.first, buffer_allocation.second);
|
|
}
|
|
|
|
while (!pipeline_layouts_.is_empty()) {
|
|
VkPipelineLayout vk_pipeline_layout = pipeline_layouts_.pop_last();
|
|
vkDestroyPipelineLayout(device.vk_handle(), vk_pipeline_layout, vk_allocation_callbacks);
|
|
}
|
|
|
|
while (!shader_modules_.is_empty()) {
|
|
VkShaderModule vk_shader_module = shader_modules_.pop_last();
|
|
vkDestroyShaderModule(device.vk_handle(), vk_shader_module, vk_allocation_callbacks);
|
|
}
|
|
}
|
|
|
|
} // namespace blender::gpu
|