maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

OS: Fix used resource debug prints

Browse source 
These methods were broken by 22419082d9
5 years ago and nobody complained, so maybe they're not so useful...
But at least this should restore them to a working state.

(cherry picked from commit 8c3a6b10a9)
This commit is contained in:
Rémi Verschelde 2021-02-28 12:10:47 +01:00
parent 659b89c615
commit 8db0bd4424
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/bind/core_bind.cpp
View file

@ -968,7 +968,7 @@ void _OS::print_all_textures_by_size() {
ResourceCache::get_cached_resources(&rsrc);
for (List<Ref<Resource>>::Element *E = rsrc.front(); E; E = E->next()) {
if (!E->get()->is_class("ImageTexture")) {
if (!E->get()->is_class("Texture")) {
continue;
}
@ -988,14 +988,30 @@ void _OS::print_all_textures_by_size() {
imgs.sort();
for (List<_OSCoreBindImg>::Element *E = imgs.front(); E; E = E->next()) {
total -= E->get().vram;
if (imgs.size() == 0) {
print_line("No textures seem used in this project.");
} else {
print_line("Textures currently in use, sorted by VRAM usage:\n"
"Path - VRAM usage (Dimensions)");
}
for (List<_OSCoreBindImg>::Element *E = imgs.front(); E; E = E->next()) {
print_line(vformat("%s - %s %s",
E->get().path,
String::humanize_size(E->get().vram),
E->get().size));
}
print_line(vformat("Total VRAM usage: %s.", String::humanize_size(total)));
}
void _OS::print_resources_by_type(const Vector<String> &p_types) {
Map<String, int> type_count;
ERR_FAIL_COND_MSG(p_types.size() == 0,
"At least one type should be provided to print resources by type.");
print_line(vformat("Resources currently in use for the following types: %s", p_types));
Map<String, int> type_count;
List<Ref<Resource>> resources;
ResourceCache::get_cached_resources(&resources);
@ -1018,8 +1034,20 @@ void _OS::print_resources_by_type(const Vector<String> &p_types) {
}
type_count[r->get_class()]++;
print_line(vformat("%s: %s", r->get_class(), r->get_path()));
List<String> metas;
r->get_meta_list(&metas);
for (List<String>::Element *F = metas.front(); F; F = F->next()) {
print_line(vformat(" %s: %s", F->get(), r->get_meta(F->get())));
}
}
};
for (Map<String, int>::Element *E = type_count.front(); E; E = E->next()) {
print_line(vformat("%s count: %d", E->key(), E->get()));
}
}
bool _OS::has_virtual_keyboard() const {
return OS::get_singleton()->has_virtual_keyboard();

2
core/os/os.cpp
View file

@ -199,7 +199,7 @@ static void _OS_printres(Object *p_obj) {
return;
}
String str = itos(res->get_instance_id()) + String(res->get_class()) + ":" + String(res->get_name()) + " - " + res->get_path();
String str = vformat("%s - %s - %s", res->to_string(), res->get_name(), res->get_path());
if (_OSPRF) {
_OSPRF->store_line(str);
} else {

2
core/resource.cpp
View file

@ -509,5 +509,7 @@ void ResourceCache::dump(const char *p_file, bool p_short) {
}
lock.read_unlock();
#else
WARN_PRINT("ResourceCache::dump only with in debug builds.");
#endif
}