Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ResourceLoader: Fixup management of thread-specific status

Browse Source 
- Allows the message queue override to flush after loading each resource, which was the original intent.
- Removes a redundant call to mark the thread as safe-for-nodes.
This commit is contained in:
Pedro J. Estébanez 2024-07-04 10:37:09 +02:00
parent 42e5b3ac2d
commit f952d3956c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/io/resource_loader.cpp
View File

@ -304,9 +304,10 @@ void ResourceLoader::_thread_load_function(void *p_userdata) {
thread_load_mutex.unlock(); thread_load_mutex.unlock();
// Thread-safe either if it's the current thread or a brand new one. // Thread-safe either if it's the current thread or a brand new one.
bool mq_override_present = false; thread_local bool mq_override_present = false;
CallQueue *own_mq_override = nullptr; CallQueue *own_mq_override = nullptr;
if (load_nesting == 0) { if (load_nesting == 0) {
mq_override_present = false;
load_paths_stack = memnew(Vector<String>); load_paths_stack = memnew(Vector<String>);
if (!load_task.dependent_path.is_empty()) { if (!load_task.dependent_path.is_empty()) {
@ -326,10 +327,6 @@ void ResourceLoader::_thread_load_function(void *p_userdata) {
} }
// -- // --
if (!Thread::is_main_thread()) {
set_current_thread_safe_for_nodes(true);
}
Ref<Resource> res = _load(load_task.remapped_path, load_task.remapped_path != load_task.local_path ? load_task.local_path : String(), load_task.type_hint, load_task.cache_mode, &load_task.error, load_task.use_sub_threads, &load_task.progress); Ref<Resource> res = _load(load_task.remapped_path, load_task.remapped_path != load_task.local_path ? load_task.local_path : String(), load_task.type_hint, load_task.cache_mode, &load_task.error, load_task.use_sub_threads, &load_task.progress);
if (mq_override_present) { if (mq_override_present) {
MessageQueue::get_singleton()->flush(); MessageQueue::get_singleton()->flush();