mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

RSX shaders cache: group programs by indexes

Browse Source
This commit is contained in:
DH 2016-06-28 12:54:08 +03:00
parent 086e1c34dd
commit 4d88296485
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/RSX/rsx_cache.cpp
View File

@ -25,7 +25,7 @@ namespace rsx
//analyze_raw_shader(raw_shader); //analyze_raw_shader(raw_shader);
std::string shader_name_base = std::string shader_name_base =
fmt::format("%016llx", raw_shader.hash()) + fmt::format("%lld.%016llx", ++m_index, raw_shader.hash()) +
(raw_shader.type == rsx::program_type::fragment ? ".fp" : ".vp"); (raw_shader.type == rsx::program_type::fragment ? ".fp" : ".vp");
fs::file{ m_path + shader_name_base + ".ucode", fs::rewrite } fs::file{ m_path + shader_name_base + ".ucode", fs::rewrite }
@ -36,7 +36,7 @@ namespace rsx
fs::file{ m_path + shader_name_base + (ctxt.lang == rsx::decompile_language::glsl ? ".glsl" : ".hlsl"), fs::rewrite } fs::file{ m_path + shader_name_base + (ctxt.lang == rsx::decompile_language::glsl ? ".glsl" : ".hlsl"), fs::rewrite }
.write(decompiled_shader.code); .write(decompiled_shader.code);
auto inserted = m_entries.insert({ raw_shader, entry_t{ decompiled_shader } }).first; auto inserted = m_entries.insert({ raw_shader, entry_t{ m_index, decompiled_shader } }).first;
inserted->second.decompiled.raw = &inserted->first; inserted->second.decompiled.raw = &inserted->first;
entry = &inserted->second; entry = &inserted->second;
} }
@ -56,7 +56,7 @@ namespace rsx
info.complete = &entry->complete.insert({ state, complete_shader }).first->second; info.complete = &entry->complete.insert({ state, complete_shader }).first->second;
info.complete->user_data = nullptr; info.complete->user_data = nullptr;
const std::string hash_combination = fmt::format("%016llx.%016llx", raw_shader.hash(), state.hash()); const std::string hash_combination = fmt::format("%lld.%016llx.%016llx", entry->index, raw_shader.hash(), state.hash());
std::string shader_name = std::string shader_name =
hash_combination + hash_combination +

2
rpcs3/Emu/RSX/rsx_cache.h
View File

@ -32,12 +32,14 @@ namespace rsx
{ {
struct entry_t struct entry_t
{ {
std::int64_t index;
decompiled_shader decompiled; decompiled_shader decompiled;
std::unordered_map<program_state, complete_shader, hasher> complete; std::unordered_map<program_state, complete_shader, hasher> complete;
}; };
std::unordered_map<raw_shader, entry_t, hasher> m_entries; std::unordered_map<raw_shader, entry_t, hasher> m_entries;
std::string m_path; std::string m_path;
std::int64_t m_index = -1;
public: public:
void path(const std::string &path_); void path(const std::string &path_);