mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-12-26 21:21:20 -08:00
shader: Reorder shader cache directories
This commit is contained in:
parent
3025b2f605
commit
cb78a1b494
@ -238,16 +238,13 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading,
|
||||
if (title_id == 0) {
|
||||
return;
|
||||
}
|
||||
auto shader_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir)};
|
||||
auto base_dir{shader_dir / "new_opengl"};
|
||||
auto transferable_dir{base_dir / "transferable"};
|
||||
auto precompiled_dir{base_dir / "precompiled"};
|
||||
if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir) ||
|
||||
!Common::FS::CreateDir(transferable_dir) || !Common::FS::CreateDir(precompiled_dir)) {
|
||||
LOG_ERROR(Common_Filesystem, "Failed to create pipeline cache directories");
|
||||
const auto shader_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir)};
|
||||
const auto base_dir{shader_dir / fmt::format("{:016x}", title_id)};
|
||||
if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir)) {
|
||||
LOG_ERROR(Common_Filesystem, "Failed to create shader cache directories");
|
||||
return;
|
||||
}
|
||||
shader_cache_filename = transferable_dir / fmt::format("{:016x}.bin", title_id);
|
||||
shader_cache_filename = base_dir / "opengl.bin";
|
||||
|
||||
if (!workers) {
|
||||
workers = CreateWorkers();
|
||||
|
@ -337,22 +337,19 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
|
||||
if (title_id == 0) {
|
||||
return;
|
||||
}
|
||||
auto shader_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir)};
|
||||
auto base_dir{shader_dir / "vulkan"};
|
||||
auto transferable_dir{base_dir / "transferable"};
|
||||
auto precompiled_dir{base_dir / "precompiled"};
|
||||
if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir) ||
|
||||
!Common::FS::CreateDir(transferable_dir) || !Common::FS::CreateDir(precompiled_dir)) {
|
||||
const auto shader_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::ShaderDir)};
|
||||
const auto base_dir{shader_dir / fmt::format("{:016x}", title_id)};
|
||||
if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir)) {
|
||||
LOG_ERROR(Common_Filesystem, "Failed to create pipeline cache directories");
|
||||
return;
|
||||
}
|
||||
pipeline_cache_filename = transferable_dir / fmt::format("{:016x}.bin", title_id);
|
||||
pipeline_cache_filename = base_dir / "vulkan.bin";
|
||||
|
||||
struct {
|
||||
std::mutex mutex;
|
||||
size_t total{0};
|
||||
size_t built{0};
|
||||
bool has_loaded{false};
|
||||
size_t total{};
|
||||
size_t built{};
|
||||
bool has_loaded{};
|
||||
} state;
|
||||
|
||||
const auto load_compute{[&](std::ifstream& file, FileEnvironment env) {
|
||||
|
Loading…
Reference in New Issue
Block a user