mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-11 05:26:24 +02:00
Merge pull request #15498 from iota97/fix-lazy
Fix lazy loading of metadata
This commit is contained in:
1 file changed
+9
-11
+9
-11
@@ -166,18 +166,16 @@ static UI::Style MakeStyle(uint32_t fg, uint32_t bg) {
|
||||
|
||||
static void LoadAtlasMetadata(Atlas &metadata, const char *filename, bool required) {
|
||||
size_t atlas_data_size = 0;
|
||||
if (!metadata.IsMetadataLoaded()) {
|
||||
const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size);
|
||||
bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size);
|
||||
if (!load_success) {
|
||||
if (required)
|
||||
ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename);
|
||||
else
|
||||
WARN_LOG(G3D, "Failed to load %s", filename);
|
||||
// Stumble along with broken visuals instead of dying...
|
||||
}
|
||||
delete[] atlas_data;
|
||||
const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size);
|
||||
bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size);
|
||||
if (!load_success) {
|
||||
if (required)
|
||||
ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename);
|
||||
else
|
||||
WARN_LOG(G3D, "Failed to load %s", filename);
|
||||
// Stumble along with broken visuals instead of dying...
|
||||
}
|
||||
delete[] atlas_data;
|
||||
}
|
||||
|
||||
void UpdateTheme(UIContext *ctx) {
|
||||
|
||||
Reference in new issue
Block a user