github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-15 15:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

GPU/TextureCache: Look for replacements outside of subdirectory

Browse Source 
i.e. old setups that do not have the `replacements` subdirectory.
This commit is contained in:
Stenzek 2024-12-11 15:02:51 +10:00
parent d871c17f3f
commit 69947fb907
No known key found for this signature in database
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/gpu_hw_texture_cache.cpp
View File

@ -2942,6 +2942,9 @@ bool GPUTextureCache::HasValidReplacementExtension(const std::string_view path)
void GPUTextureCache::FindTextureReplacements(bool load_vram_write_replacements, bool load_texture_replacements) void GPUTextureCache::FindTextureReplacements(bool load_vram_write_replacements, bool load_texture_replacements)
{ {
if (s_state.game_id.empty())
return;
FileSystem::FindResultsArray files; FileSystem::FindResultsArray files;
FileSystem::FindFiles(GetTextureReplacementDirectory().c_str(), "*", FileSystem::FindFiles(GetTextureReplacementDirectory().c_str(), "*",
FILESYSTEM_FIND_FILES | FILESYSTEM_FIND_RECURSIVE, &files); FILESYSTEM_FIND_FILES | FILESYSTEM_FIND_RECURSIVE, &files);
@ -3028,6 +3031,9 @@ void GPUTextureCache::LoadTextureReplacementAliases(const ryml::ConstNodeRef& ro
bool load_vram_write_replacement_aliases, bool load_vram_write_replacement_aliases,
bool load_texture_replacement_aliases) bool load_texture_replacement_aliases)
{ {
if (s_state.game_id.empty())
return;
const std::string source_dir = GetTextureReplacementDirectory(); const std::string source_dir = GetTextureReplacementDirectory();
for (const ryml::ConstNodeRef& current : root.cchildren()) for (const ryml::ConstNodeRef& current : root.cchildren())
@ -3303,8 +3309,18 @@ bool GPUTextureCache::EnsureGameDirectoryExists()
std::string GPUTextureCache::GetTextureReplacementDirectory() std::string GPUTextureCache::GetTextureReplacementDirectory()
{ {
return Path::Combine(EmuFolders::Textures, std::string dir = Path::Combine(
SmallString::from_format("{}" FS_OSPATH_SEPARATOR_STR "replacements", s_state.game_id)); EmuFolders::Textures, SmallString::from_format("{}" FS_OSPATH_SEPARATOR_STR "replacements", s_state.game_id));
if (!FileSystem::DirectoryExists(dir.c_str()))
{
// Check for the old directory structure without a replacements subdirectory.
std::string altdir = Path::Combine(EmuFolders::Textures, s_state.game_id);
if (FileSystem::DirectoryExists(altdir.c_str()))
WARNING_LOG("Using deprecated texture replacement directory {}", altdir);
dir = std::move(altdir);
}
return dir;
} }
std::string GPUTextureCache::GetTextureDumpDirectory() std::string GPUTextureCache::GetTextureDumpDirectory()