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): defer model buffer destruction and per-frame FXAA descriptors

Browse source 
CharacterRenderer::destroyModelGPU now defers vertex/index buffer
destruction when replacing models mid-stream, preventing use-after-free
on AMD RADV. FXAA descriptor sets are now per-frame to eliminate
write-read races between in-flight command buffers. Water reflection
descriptor update narrowed to current frame only.
This commit is contained in:
Kelsi 2026-04-03 19:17:55 -07:00
parent e19bf76d88
commit 40e72d535e
5 changed files with 71 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/rendering/character_renderer.cpp
View file

@ -472,11 +472,31 @@ void CharacterRenderer::createFallbackTextures(VkDevice device) {
}
}
void CharacterRenderer::destroyModelGPU(M2ModelGPU& gpuModel) {
void CharacterRenderer::destroyModelGPU(M2ModelGPU& gpuModel, bool defer) {
if (!vkCtx_) return;
VmaAllocator alloc = vkCtx_->getAllocator();
if (gpuModel.vertexBuffer) { vmaDestroyBuffer(alloc, gpuModel.vertexBuffer, gpuModel.vertexAlloc); gpuModel.vertexBuffer = VK_NULL_HANDLE; }
if (gpuModel.indexBuffer) { vmaDestroyBuffer(alloc, gpuModel.indexBuffer, gpuModel.indexAlloc); gpuModel.indexBuffer = VK_NULL_HANDLE; }
// Snapshot raw handles and null the model fields immediately
::VkBuffer vb = gpuModel.vertexBuffer;
VmaAllocation vbAlloc = gpuModel.vertexAlloc;
::VkBuffer ib = gpuModel.indexBuffer;
VmaAllocation ibAlloc = gpuModel.indexAlloc;
gpuModel.vertexBuffer = VK_NULL_HANDLE;
gpuModel.vertexAlloc = VK_NULL_HANDLE;
gpuModel.indexBuffer = VK_NULL_HANDLE;
gpuModel.indexAlloc = VK_NULL_HANDLE;
if (!defer) {
// Safe after vkDeviceWaitIdle (shutdown / clear paths)
if (vb) vmaDestroyBuffer(alloc, vb, vbAlloc);
if (ib) vmaDestroyBuffer(alloc, ib, ibAlloc);
} else if (vb || ib) {
// Streaming path: in-flight command buffers may still reference these
vkCtx_->deferAfterFrameFence([alloc, vb, vbAlloc, ib, ibAlloc]() {
if (vb) vmaDestroyBuffer(alloc, vb, vbAlloc);
if (ib) vmaDestroyBuffer(alloc, ib, ibAlloc);
});
}
}
void CharacterRenderer::destroyInstanceBones(CharacterInstance& inst, bool defer) {
@ -1412,7 +1432,7 @@ bool CharacterRenderer::loadModel(const pipeline::M2Model& model, uint32_t id) {
if (models.find(id) != models.end()) {
core::Logger::getInstance().warning("Model ID ", id, " already loaded, replacing");
destroyModelGPU(models[id]);
destroyModelGPU(models[id], /*defer=*/true);
}
M2ModelGPU gpuModel;