mirror of
https://github.com/open-goal/jak-project
synced 2026-08-10 11:14:50 -04:00
decompiler: reduce memory usage during texture pack installation by lazily loading texture replacements and serializing level building (#4278)
Three changes: 1. Add lazy merging/replacing for texture `rgba_bytes`. 2. Use a single thread when decompiling with texture replacements. 3. Drop textures after serializing and before compression. These changes should enable users to install **massive** texture packs without issue.
This commit is contained in:
tripp
+100
-47
@@ -100,57 +100,110 @@ void TextureDB::add_index_texture(u32 tpage,
|
||||
}
|
||||
|
||||
void TextureDB::merge_textures(const fs::path& base_path) {
|
||||
for (auto& tex : textures) {
|
||||
fs::path full_path = base_path / tpage_names.at(tex.second.page) / (tex.second.name + ".png");
|
||||
if (fs::exists(full_path)) {
|
||||
lg::info("Merging {}", full_path.string().c_str());
|
||||
int w, h;
|
||||
auto merge_data = stbi_load(full_path.string().c_str(), &w, &h, 0, 4); // rgba channels
|
||||
if (!merge_data) {
|
||||
lg::warn("failed to load PNG file: {}", full_path.string().c_str());
|
||||
continue;
|
||||
} else if (w != tex.second.w || h != tex.second.h) {
|
||||
lg::warn("merge texture does not match the same dimensions: {}, {} != {} || {} != {}",
|
||||
full_path.string().c_str(), w, tex.second.w, h, tex.second.h);
|
||||
stbi_image_free(merge_data);
|
||||
continue;
|
||||
}
|
||||
// Merge any non-transparent pixels into the existing texture
|
||||
for (int i = 0; i < w * h * 4; i += 4) {
|
||||
const auto merge_pixel_a = merge_data[i + 3];
|
||||
if (merge_pixel_a != 0) {
|
||||
u32 merge_pixel;
|
||||
memcpy(&merge_pixel, &merge_data[i], sizeof(u32));
|
||||
tex.second.rgba_bytes.at(i / 4) = merge_pixel;
|
||||
}
|
||||
}
|
||||
stbi_image_free(merge_data);
|
||||
}
|
||||
}
|
||||
merge_texture_dir = base_path;
|
||||
}
|
||||
|
||||
void TextureDB::replace_textures(const fs::path& path) {
|
||||
fs::path base_path(path);
|
||||
for (auto& tex : textures) {
|
||||
fs::path full_path = base_path / tpage_names.at(tex.second.page) / (tex.second.name + ".png");
|
||||
if (!fs::exists(full_path)) {
|
||||
full_path = base_path / "_all" / (tex.second.name + ".png");
|
||||
if (!fs::exists(full_path))
|
||||
continue;
|
||||
}
|
||||
lg::info("Replacing {}", tpage_names.at(tex.second.page) + "/" + (tex.second.name));
|
||||
int w, h;
|
||||
auto data = stbi_load(full_path.string().c_str(), &w, &h, 0, 4); // rgba channels
|
||||
if (!data) {
|
||||
lg::warn("failed to load PNG file: {}", full_path.string().c_str());
|
||||
continue;
|
||||
}
|
||||
tex.second.rgba_bytes.resize(w * h);
|
||||
memcpy(tex.second.rgba_bytes.data(), data, w * h * 4);
|
||||
tex.second.w = w;
|
||||
tex.second.h = h;
|
||||
stbi_image_free(data);
|
||||
replace_texture_dir = path;
|
||||
}
|
||||
|
||||
void TextureDB::merge_texture(u32 id, std::vector<u32>& rgba) const {
|
||||
if (!merge_texture_dir) {
|
||||
return;
|
||||
}
|
||||
|
||||
const auto& tex = textures.at(id);
|
||||
fs::path full_path = *merge_texture_dir / tpage_names.at(tex.page) / (tex.name + ".png");
|
||||
|
||||
if (!fs::exists(full_path)) {
|
||||
return;
|
||||
}
|
||||
|
||||
lg::info("Merging {}", full_path.string().c_str());
|
||||
|
||||
int w, h;
|
||||
auto merge_data = stbi_load(full_path.string().c_str(), &w, &h, 0, 4);
|
||||
|
||||
if (!merge_data) {
|
||||
lg::warn("failed to load PNG file: {}", full_path.string().c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
if (w != tex.w || h != tex.h) {
|
||||
lg::warn("merge texture does not match the same dimensions: {}, {} != {} || {} != {}",
|
||||
full_path.string().c_str(), w, tex.w, h, tex.h);
|
||||
stbi_image_free(merge_data);
|
||||
return;
|
||||
}
|
||||
// Merge any non-transparent pixels into the existing texture
|
||||
for (int i = 0; i < w * h * 4; i += 4) {
|
||||
const auto merge_pixel_a = merge_data[i + 3];
|
||||
if (merge_pixel_a != 0) {
|
||||
u32 merge_pixel;
|
||||
memcpy(&merge_pixel, &merge_data[i], sizeof(u32));
|
||||
rgba.at(i / 4) = merge_pixel;
|
||||
}
|
||||
}
|
||||
|
||||
stbi_image_free(merge_data);
|
||||
}
|
||||
|
||||
std::optional<ResolvedTextureData> TextureDB::replace_texture(u32 id) const {
|
||||
if (!replace_texture_dir) {
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
const auto& tex = textures.at(id);
|
||||
const auto& tpage_name = tpage_names.at(tex.page);
|
||||
|
||||
fs::path full_path = *replace_texture_dir / tpage_name / (tex.name + ".png");
|
||||
|
||||
if (!fs::exists(full_path)) {
|
||||
full_path = *replace_texture_dir / "_all" / (tex.name + ".png");
|
||||
|
||||
if (!fs::exists(full_path)) {
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
|
||||
lg::info("Replacing {}", tpage_name + "/" + tex.name);
|
||||
|
||||
int w, h;
|
||||
auto data = stbi_load(full_path.string().c_str(), &w, &h, 0, 4);
|
||||
|
||||
if (!data) {
|
||||
lg::warn("failed to load PNG file: {}", full_path.string().c_str());
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
ResolvedTextureData result;
|
||||
result.w = static_cast<u16>(w);
|
||||
result.h = static_cast<u16>(h);
|
||||
result.rgba.resize(w * h);
|
||||
|
||||
memcpy(result.rgba.data(), data, w * h * 4);
|
||||
|
||||
stbi_image_free(data);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
ResolvedTextureData TextureDB::resolve_texture(u32 id) const {
|
||||
const auto& tex = textures.at(id);
|
||||
|
||||
ResolvedTextureData result{
|
||||
.w = tex.w,
|
||||
.h = tex.h,
|
||||
.rgba = tex.rgba_bytes,
|
||||
};
|
||||
|
||||
merge_texture(id, result.rgba);
|
||||
|
||||
if (auto replacement = replace_texture(id)) {
|
||||
result = std::move(*replacement);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <map>
|
||||
#include <optional>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
@@ -11,6 +12,12 @@
|
||||
#include "common/util/FileUtil.h"
|
||||
|
||||
namespace decompiler {
|
||||
struct ResolvedTextureData {
|
||||
u16 w;
|
||||
u16 h;
|
||||
std::vector<u32> rgba;
|
||||
};
|
||||
|
||||
struct TextureDB {
|
||||
TextureDB();
|
||||
struct TextureData {
|
||||
@@ -25,12 +32,16 @@ struct TextureDB {
|
||||
std::map<u32, TextureData> textures;
|
||||
std::unordered_map<u32, std::string> tpage_names;
|
||||
std::unordered_map<std::string, std::set<u32>> texture_ids_per_level;
|
||||
std::optional<fs::path> merge_texture_dir;
|
||||
std::optional<fs::path> replace_texture_dir;
|
||||
|
||||
// special textures for animation.
|
||||
std::map<u32, tfrag3::IndexTexture> index_textures_by_combo_id;
|
||||
|
||||
std::unordered_map<std::string, u32> animated_tex_output_to_anim_slot;
|
||||
|
||||
ResolvedTextureData resolve_texture(u32 id) const;
|
||||
|
||||
static constexpr int kPlaceholderWhiteTexturePage = INT16_MAX;
|
||||
static constexpr int kPlaceholderWhiteTextureId = 0;
|
||||
|
||||
@@ -57,6 +68,8 @@ struct TextureDB {
|
||||
|
||||
void merge_textures(const fs::path& base_path);
|
||||
void replace_textures(const fs::path& path);
|
||||
void merge_texture(u32 id, std::vector<u32>& rgba) const;
|
||||
std::optional<ResolvedTextureData> replace_texture(u32 id) const;
|
||||
|
||||
std::string generate_texture_dest_adjustment_table() const;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user