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

fix: terrain chunk UBO allocation failure crashed GPU via null descriptor

Browse source 
vmaCreateBuffer return value was silently discarded in both loadTerrain
and loadTerrainIncremental. If allocation failed (OOM/fragmentation),
the chunk proceeded with a VK_NULL_HANDLE UBO, causing the GPU to read
from an invalid descriptor on the next draw call. Now checks the return
value and skips the chunk on failure.
This commit is contained in:
Kelsi 2026-03-29 20:14:35 -07:00
parent c1f6364814
commit ef25785404
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/rendering/terrain_renderer.cpp
View file

@ -388,17 +388,21 @@ bool TerrainRenderer::loadTerrain(const pipeline::TerrainMesh& mesh,
allocCI.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
VmaAllocationInfo mapInfo{};
vmaCreateBuffer(vkCtx->getAllocator(), &bufCI, &allocCI,
&gpuChunk.paramsUBO, &gpuChunk.paramsAlloc, &mapInfo);
// Check return value — a null UBO handle would cause the GPU to
// read from an invalid descriptor, crashing the driver under
// memory pressure instead of gracefully skipping the chunk.
if (vmaCreateBuffer(vkCtx->getAllocator(), &bufCI, &allocCI,
&gpuChunk.paramsUBO, &gpuChunk.paramsAlloc, &mapInfo) != VK_SUCCESS) {
LOG_WARNING("Terrain chunk UBO allocation failed — skipping chunk");
destroyChunkGPU(gpuChunk);
continue;
}
if (mapInfo.pMappedData) {
std::memcpy(mapInfo.pMappedData, &params, sizeof(params));
}
// Allocate and write material descriptor set
gpuChunk.materialSet = allocateMaterialSet();
if (!gpuChunk.materialSet) {
// Pool exhaustion can happen transiently while tile churn is high.
// Drop this chunk instead of retaining non-renderable GPU resources.
destroyChunkGPU(gpuChunk);
continue;
}
@ -484,15 +488,18 @@ bool TerrainRenderer::loadTerrainIncremental(const pipeline::TerrainMesh& mesh,
allocCI.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
VmaAllocationInfo mapInfo{};
vmaCreateBuffer(vkCtx->getAllocator(), &bufCI, &allocCI,
&gpuChunk.paramsUBO, &gpuChunk.paramsAlloc, &mapInfo);
if (vmaCreateBuffer(vkCtx->getAllocator(), &bufCI, &allocCI,
&gpuChunk.paramsUBO, &gpuChunk.paramsAlloc, &mapInfo) != VK_SUCCESS) {
LOG_WARNING("Terrain chunk UBO allocation failed (incremental) — skipping chunk");
destroyChunkGPU(gpuChunk);
continue;
}
if (mapInfo.pMappedData) {
std::memcpy(mapInfo.pMappedData, &params, sizeof(params));
}
gpuChunk.materialSet = allocateMaterialSet();
if (!gpuChunk.materialSet) {
// Keep memory/work bounded under descriptor pool pressure.
destroyChunkGPU(gpuChunk);
continue;
}