Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ResourceLoader: Print load message only when actually loading #99667

Merged
merged 1 commit into from
Dec 18, 2024
Merged

ResourceLoader: Print load message only when actually loading #99667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions core/io/resource_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
}
load_paths_stack.push_back(original_path);

print_verbose(vformat("Loading resource: %s", p_path));

// Try all loaders and pick the first match for the type hint
bool found = false;
Ref<Resource> res;
Expand All @@ -303,7 +305,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
}
found = true;
res = loader[i]->load(p_path, original_path, r_error, p_use_sub_threads, r_progress, p_cache_mode);
if (!res.is_null()) {
if (res.is_valid()) {
break;
}
}
Expand All @@ -312,8 +314,10 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
res_ref_overrides.erase(load_nesting);
load_nesting--;

if (!res.is_null()) {
if (res.is_valid()) {
return res;
} else {
print_verbose(vformat("Failed loading resource: %s", p_path));
}

ERR_FAIL_COND_V_MSG(found, Ref<Resource>(),
Expand Down Expand Up @@ -361,18 +365,12 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
bool xl_remapped = false;
const String &remapped_path = _path_remap(load_task.local_path, &xl_remapped);

print_verbose("Loading resource: " + remapped_path);

Error load_err = OK;
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();
}

if (res.is_null()) {
print_verbose("Failed loading resource: " + remapped_path);
}

thread_load_mutex.lock();

load_task.resource = res;
Expand Down