diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-07-10 13:51:02 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-09-05 13:29:38 +0200 |
| commit | 8a78f5c323d5d6e6471c2a0182732744e47ea637 (patch) | |
| tree | 3a764f59f74924ffdaa722fe2b0765b6f8a069b1 | |
| parent | ea28ac510de3cef098a7624986072ff44546e87f (diff) | |
| download | redot-engine-8a78f5c323d5d6e6471c2a0182732744e47ea637.tar.gz | |
ResourceLoader: Optimize remap check by deferring until a non-mutex zone
(cherry picked from commit 5c970db2e49af93139d15d3fe090db44b4bd3317)
| -rw-r--r-- | core/io/resource_loader.cpp | 9 | ||||
| -rw-r--r-- | core/io/resource_loader.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index f21d1e92dd..9938b0ac5d 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -338,8 +338,10 @@ void ResourceLoader::_run_load_task(void *p_userdata) { } // -- + bool xl_remapped = false; + const String &remapped_path = _path_remap(load_task.local_path, &xl_remapped); Error load_err = OK; - 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_err, load_task.use_sub_threads, &load_task.progress); + Ref<Resource> res = _load(remapped_path, remapped_path != load_task.local_path ? load_task.local_path : String(), load_task.type_hint, load_task.cache_mode, &load_err, load_task.use_sub_threads, &load_task.progress); if (MessageQueue::get_singleton() != MessageQueue::get_main_singleton()) { MessageQueue::get_singleton()->flush(); } @@ -398,14 +400,14 @@ void ResourceLoader::_run_load_task(void *p_userdata) { load_task.resource->set_path_cache(load_task.local_path); } - if (load_task.xl_remapped) { + if (xl_remapped) { load_task.resource->set_as_translation_remapped(true); } #ifdef TOOLS_ENABLED load_task.resource->set_edited(false); if (timestamp_on_load) { - uint64_t mt = FileAccess::get_modified_time(load_task.remapped_path); + uint64_t mt = FileAccess::get_modified_time(remapped_path); //printf("mt %s: %lli\n",remapped_path.utf8().get_data(),mt); load_task.resource->set_last_modified_time(mt); } @@ -527,7 +529,6 @@ Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path, { ThreadLoadTask load_task; - load_task.remapped_path = _path_remap(local_path, &load_task.xl_remapped); load_task.load_token = load_token.ptr(); load_task.local_path = local_path; load_task.type_hint = p_type_hint; diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 511bea1e16..f00a5cf117 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -173,7 +173,6 @@ private: bool need_wait = true; LoadToken *load_token = nullptr; String local_path; - String remapped_path; String type_hint; float progress = 0.0f; float max_reported_progress = 0.0f; @@ -182,7 +181,6 @@ private: ResourceFormatLoader::CacheMode cache_mode = ResourceFormatLoader::CACHE_MODE_REUSE; Error error = OK; Ref<Resource> resource; - bool xl_remapped = false; bool use_sub_threads = false; HashSet<String> sub_tasks; }; |