Skip to content

Commit

Permalink
803e8a3e: texStreaming: ninjafix for possible deadlock
Browse files Browse the repository at this point in the history
  • Loading branch information
NicSavichev committed Jan 14, 2025
1 parent 34f9a79 commit fea0a2b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions prog/engine/lib3d/texPackMgr2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1797,10 +1797,10 @@ bool ddsx::tex_pack2_perform_delayed_data_loading(int prio)
for (int i = 0; i < tex_packs.size() && interlocked_acquire_load(processingTexData[prio]); i++)
done |= tex_packs[i].pack->file->performDelayedLoad(full_prio);
if (!is_managed_textures_streaming_load_on_demand())
run_action_on_main_thread_and_wait([]() {
d3d::GpuAutoLock lock;
RMGR.performAsyncTextureReplacementCompletions();
});
{
d3d::GpuAutoLock lock;
RMGR.performAsyncTextureReplacementCompletions();
}

if (!interlocked_acquire_load(pendingTexCount[prio]) || !interlocked_acquire_load(processingTexData[prio]))
break;
Expand Down

0 comments on commit fea0a2b

Please sign in to comment.