Skip to content

Fix crash, when a TextureView referenced by a framebuffer is deleted #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bennysj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash, when a TextureView referenced by a framebuffer is deleted #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/KDGpu/vulkan/vulkan_resource_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,20 @@ void VulkanResourceManager::deleteTextureView(const Handle<TextureView_t> &handl
{
VulkanTextureView *vulkanTextureView = m_textureViews.get(handle);
VulkanDevice *vulkanDevice = m_devices.get(vulkanTextureView->deviceHandle);

for(const auto &vulkanFramebufferKey : vulkanTextureView->associatedFrameBuffers) {
auto itFramebuffer = vulkanDevice->framebuffers.find(vulkanFramebufferKey);
if (itFramebuffer == vulkanDevice->framebuffers.end()) {
// This framebuffer has already been destroyed, just ignore
continue;
}

auto *framebuffer = m_framebuffers.get(itFramebuffer->second);
vkDestroyFramebuffer(vulkanDevice->device, framebuffer->framebuffer, nullptr);
vulkanDevice->framebuffers.erase(itFramebuffer);
m_framebuffers.remove(itFramebuffer->second);
}

vkDestroyImageView(vulkanDevice->device, vulkanTextureView->imageView, nullptr);

m_textureViews.remove(handle);
Expand Down Expand Up @@ -2918,6 +2932,9 @@ Handle<Framebuffer_t> VulkanResourceManager::createFramebuffer(const Handle<Devi
return {};
}

for (uint32_t i = 0; i < attachmentCount; ++i)
m_textureViews.get(attachments.at(i))->associatedFrameBuffers.push_back(frameBufferKey);

const auto vulkanFramebufferHandle = m_framebuffers.emplace(VulkanFramebuffer(vkFramebuffer));
return vulkanFramebufferHandle;
}
Expand Down
3 changes: 3 additions & 0 deletions src/KDGpu/vulkan/vulkan_texture_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include <vulkan/vulkan.h>

#include "vulkan_framebuffer.h"

namespace KDGpu {

struct Texture_t;
Expand All @@ -33,6 +35,7 @@ struct KDGPU_EXPORT VulkanTextureView {
VkImageView imageView{ VK_NULL_HANDLE };
Handle<Texture_t> textureHandle;
Handle<Device_t> deviceHandle;
std::vector<VulkanFramebufferKey> associatedFrameBuffers;
};

} // namespace KDGpu