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

Reduce tile finalization aggressiveness to prevent spawn hitching

Browse source 
- Reduce max finalization steps per frame: 2→1 (normal), 8→4 (taxi)
- Reduce terrain chunk upload batch: 32→16 chunks per step
- Reduce idle M2 model upload budget: 16→6 per step
- Reduce idle WMO model upload budget: 4→2 per step

Tiles still stream in quickly but spread GPU upload work across
more frames, eliminating the frame spikes right after spawning.
This commit is contained in:
Kelsi 2026-03-07 22:51:59 -08:00
parent ac3c90dd75
commit 7f573fc06b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rendering/terrain_manager.cpp
View file

@ -816,7 +816,7 @@ bool TerrainManager::advanceFinalization(FinalizingTile& ft) {
} }
bool allDone = terrainRenderer->loadTerrainIncremental( bool allDone = terrainRenderer->loadTerrainIncremental(
pending->mesh, pending->terrain.textures, x, y, pending->mesh, pending->terrain.textures, x, y,
ft.terrainChunkNext, 32); ft.terrainChunkNext, 16);
if (!allDone) { if (!allDone) {
return false; // More chunks remain — yield to time budget return false; // More chunks remain — yield to time budget
} }
@ -858,7 +858,7 @@ bool TerrainManager::advanceFinalization(FinalizingTile& ft) {
std::lock_guard<std::mutex> lk(queueMutex); std::lock_guard<std::mutex> lk(queueMutex);
workersIdle = loadQueue.empty() && readyQueue.empty(); workersIdle = loadQueue.empty() && readyQueue.empty();
} }
const size_t kModelsPerStep = workersIdle ? 16 : 4; const size_t kModelsPerStep = workersIdle ? 6 : 4;
size_t uploaded = 0; size_t uploaded = 0;
while (ft.m2ModelIndex < pending->m2Models.size() && uploaded < kModelsPerStep) { while (ft.m2ModelIndex < pending->m2Models.size() && uploaded < kModelsPerStep) {
auto& m2Ready = pending->m2Models[ft.m2ModelIndex]; auto& m2Ready = pending->m2Models[ft.m2ModelIndex];
@ -925,7 +925,7 @@ bool TerrainManager::advanceFinalization(FinalizingTile& ft) {
std::lock_guard<std::mutex> lk(queueMutex); std::lock_guard<std::mutex> lk(queueMutex);
wmoWorkersIdle = loadQueue.empty() && readyQueue.empty(); wmoWorkersIdle = loadQueue.empty() && readyQueue.empty();
} }
const size_t kWmosPerStep = wmoWorkersIdle ? 4 : 1; const size_t kWmosPerStep = wmoWorkersIdle ? 2 : 1;
size_t uploaded = 0; size_t uploaded = 0;
while (ft.wmoModelIndex < pending->wmoModels.size() && uploaded < kWmosPerStep) { while (ft.wmoModelIndex < pending->wmoModels.size() && uploaded < kWmosPerStep) {
auto& wmoReady = pending->wmoModels[ft.wmoModelIndex]; auto& wmoReady = pending->wmoModels[ft.wmoModelIndex];
@ -1207,7 +1207,7 @@ void TerrainManager::processReadyTiles() {
// Async upload batch: record GPU copies into a command buffer, submit with // Async upload batch: record GPU copies into a command buffer, submit with
// a fence, but DON'T wait. The fence is polled on subsequent frames. // a fence, but DON'T wait. The fence is polled on subsequent frames.
// This eliminates the main-thread stall from vkWaitForFences entirely. // This eliminates the main-thread stall from vkWaitForFences entirely.
const int maxSteps = taxiStreamingMode_ ? 8 : 2; const int maxSteps = taxiStreamingMode_ ? 4 : 1;
int steps = 0; int steps = 0;
if (vkCtx) vkCtx->beginUploadBatch(); if (vkCtx) vkCtx->beginUploadBatch();