The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-01-09 00:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

separate metal shader cache

Browse Source
This commit is contained in:
Samuliak 2024-11-04 19:03:59 +01:00
parent 2e93b08b39
commit 27902009c6
No known key found for this signature in database
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cafe/HW/Latte/Core/LatteShaderCache.cpp
View File

@ -257,7 +257,11 @@ void LatteShaderCache_Load()
#endif #endif
// get cache file name // get cache file name
const auto pathGeneric = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}_shaders.bin", cacheTitleId); fs::path pathGeneric;
if (g_renderer->GetType() == RendererAPI::Metal)
pathGeneric = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}_mtlshaders.bin", cacheTitleId);
else
pathGeneric = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}_shaders.bin", cacheTitleId);
const auto pathGenericPre1_25_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}.bin", cacheTitleId); // before 1.25.0 const auto pathGenericPre1_25_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:016x}.bin", cacheTitleId); // before 1.25.0
const auto pathGenericPre1_16_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:08x}.bin", CafeSystem::GetRPXHashBase()); // before 1.16.0 const auto pathGenericPre1_16_0 = ActiveSettings::GetCachePath("shaderCache/transferable/{:08x}.bin", CafeSystem::GetRPXHashBase()); // before 1.16.0

4
src/gui/components/wxGameList.cpp
View File

@ -70,7 +70,9 @@ std::list<fs::path> _getCachesPaths(const TitleId& titleId)
ActiveSettings::GetCachePath(L"shaderCache/precompiled/{:016x}_spirv.bin", titleId), ActiveSettings::GetCachePath(L"shaderCache/precompiled/{:016x}_spirv.bin", titleId),
ActiveSettings::GetCachePath(L"shaderCache/precompiled/{:016x}_gl.bin", titleId), ActiveSettings::GetCachePath(L"shaderCache/precompiled/{:016x}_gl.bin", titleId),
ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_shaders.bin", titleId), ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_shaders.bin", titleId),
ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_vkpipeline.bin", titleId)}; ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_mtlshaders.bin", titleId),
ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_vkpipeline.bin", titleId),
ActiveSettings::GetCachePath(L"shaderCache/transferable/{:016x}_mtlpipeline.bin", titleId)};
cachePaths.remove_if( cachePaths.remove_if(
[](const fs::path& cachePath) [](const fs::path& cachePath)

4
src/tools/ShaderCacheMerger.cpp
View File

@ -106,6 +106,8 @@ void MergeShaderAndPipelineCacheFiles()
auto filename = it.path().filename().generic_string(); auto filename = it.path().filename().generic_string();
if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_shaders.bin)"))) if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_shaders.bin)")))
MergeShaderCacheFile(filename); MergeShaderCacheFile(filename);
if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_mtlshaders.bin)")))
MergeShaderCacheFile(filename);
} }
printf("\nScanning for pipeline cache files to merge...\n"); printf("\nScanning for pipeline cache files to merge...\n");
for (const auto& it : fs::directory_iterator("shaderCache/transferable/")) for (const auto& it : fs::directory_iterator("shaderCache/transferable/"))
@ -115,6 +117,8 @@ void MergeShaderAndPipelineCacheFiles()
auto filename = it.path().filename().generic_string(); auto filename = it.path().filename().generic_string();
if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_vkpipeline.bin)"))) if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_vkpipeline.bin)")))
MergePipelineCacheFile(filename); MergePipelineCacheFile(filename);
if (std::regex_match(filename, std::regex("^[0-9a-fA-F]{16}(?:_mtlpipeline.bin)")))
MergePipelineCacheFile(filename);
} }
} }