phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-15 00:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(rendering): prevent shutdown crash from deferred cleanup use-after-free

Browse source 
During shutdown, VkContext::runDeferredCleanup() was executing lambdas
that called vkFreeDescriptorSets on descriptor pools already destroyed
by Renderer::shutdown(). This corrupted the validation layer's internal
state, causing a SIGSEGV during process exit on AMD RADV.

Clear the deferred queues without executing them — vkDestroyDevice
reclaims all device-child resources anyway. Also guard against the
double shutdown() call (explicit + destructor).
This commit is contained in:
Kelsi 2026-04-03 18:02:24 -07:00
parent b2cb98e969
commit 2096e67bf9
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rendering/vk_context.cpp
View file

@ -106,14 +106,20 @@ bool VkContext::initialize(SDL_Window* window) {
}
void VkContext::shutdown() {
if (!device && !instance) return; // Already shut down or never initialized
LOG_WARNING("VkContext::shutdown - vkDeviceWaitIdle...");
if (device) {
vkDeviceWaitIdle(device);
}
// With the device idle, it is safe to run any deferred per-frame cleanup.
// Clear deferred cleanup queues WITHOUT executing them. By this point the
// sub-renderers (which own the descriptor pools/buffers these lambdas
// reference) have already been destroyed, so running them would call
// vkFreeDescriptorSets on invalid pools. vkDestroyDevice reclaims all
// device-child resources anyway.
for (uint32_t fi = 0; fi < MAX_FRAMES_IN_FLIGHT; fi++) {
runDeferredCleanup(fi);
deferredCleanup_[fi].clear();
}
LOG_WARNING("VkContext::shutdown - destroyImGuiResources...");