godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

CommandQueueMT: Fix flush re-entrancy

Browse Source
This commit is contained in:
Pedro J. Estébanez
2024-04-10 09:57:33 +02:00
parent e5b4ef8e95
commit 114b14b0fa
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/templates/command_queue_mt.h
View File

@@ -364,6 +364,12 @@ class CommandQueueMT {
void _flush() { void _flush() {
lock(); lock();
if (unlikely(flush_read_ptr)) {
// Re-entrant call.
unlock();
return;
}
WorkerThreadPool::thread_enter_command_queue_mt_flush(this); WorkerThreadPool::thread_enter_command_queue_mt_flush(this);
while (flush_read_ptr < command_mem.size()) { while (flush_read_ptr < command_mem.size()) {
uint64_t size = *(uint64_t *)&command_mem[flush_read_ptr]; uint64_t size = *(uint64_t *)&command_mem[flush_read_ptr];
@@ -376,13 +382,6 @@ class CommandQueueMT {
sync_sem->sem.post(); // Release in case it needs sync/ret. sync_sem->sem.post(); // Release in case it needs sync/ret.
} }
if (unlikely(flush_read_ptr == 0)) {
// A reentrant call flushed.
DEV_ASSERT(command_mem.is_empty());
unlock();
return;
}
flush_read_ptr += size; flush_read_ptr += size;
} }
WorkerThreadPool::thread_exit_command_queue_mt_flush(); WorkerThreadPool::thread_exit_command_queue_mt_flush();