phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(terrain): drop chunks when material descriptor allocation fails

Browse source
This commit is contained in:
Kelsi 2026-03-14 06:34:09 -07:00
parent e7c1000fc2
commit 7b5ead8bd9
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/rendering/terrain_renderer.cpp
View file

@ -396,9 +396,13 @@ bool TerrainRenderer::loadTerrain(const pipeline::TerrainMesh& mesh,
// Allocate and write material descriptor set
gpuChunk.materialSet = allocateMaterialSet();
if (gpuChunk.materialSet) {
writeMaterialDescriptors(gpuChunk.materialSet, gpuChunk);
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;
}
writeMaterialDescriptors(gpuChunk.materialSet, gpuChunk);
chunks.push_back(std::move(gpuChunk));
}
@ -487,9 +491,12 @@ bool TerrainRenderer::loadTerrainIncremental(const pipeline::TerrainMesh& mesh,
}
gpuChunk.materialSet = allocateMaterialSet();
if (gpuChunk.materialSet) {
writeMaterialDescriptors(gpuChunk.materialSet, gpuChunk);
if (!gpuChunk.materialSet) {
// Keep memory/work bounded under descriptor pool pressure.
destroyChunkGPU(gpuChunk);
continue;
}
writeMaterialDescriptors(gpuChunk.materialSet, gpuChunk);
chunks.push_back(std::move(gpuChunk));
uploaded++;
@ -653,7 +660,11 @@ VkDescriptorSet TerrainRenderer::allocateMaterialSet() {
VkDescriptorSet set = VK_NULL_HANDLE;
if (vkAllocateDescriptorSets(vkCtx->getDevice(), &allocInfo, &set) != VK_SUCCESS) {
LOG_WARNING("TerrainRenderer: failed to allocate material descriptor set");
static uint64_t failCount = 0;
++failCount;
if (failCount <= 8 || (failCount % 256) == 0) {
LOG_WARNING("TerrainRenderer: failed to allocate material descriptor set (count=", failCount, ")");
}
return VK_NULL_HANDLE;
}
return set;