RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

rsx: Make FP shader cache load lock-free

Browse Source
This commit is contained in:
Eladash 2021-01-02 11:22:30 +02:00 committed by kd-11
parent 21d725daa5
commit 0e278d2299
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,8 +423,7 @@ namespace rsx
std::string version_prefix; std::string version_prefix;
std::string root_path; std::string root_path;
std::string pipeline_class_name; std::string pipeline_class_name;
std::mutex fpd_mutex; lf_fifo<std::unique_ptr<u8[]>, 100> fragment_program_data;
std::unordered_map<u64, std::vector<u8>> fragment_program_data;
backend_storage& m_storage; backend_storage& m_storage;
@ -694,9 +693,7 @@ namespace rsx
{ {
RSXVertexProgram vp = {}; RSXVertexProgram vp = {};
std::string filename = fmt::format("%llX.vp", program_hash); fs::file f(fmt::format("%s/raw/%llX.vp", root_path, program_hash));
fs::file f(root_path + "/raw/" + filename);
if (f) f.read(vp.data, f.size() / sizeof(u32)); if (f) f.read(vp.data, f.size() / sizeof(u32));
vp.skip_vertex_input_check = true; vp.skip_vertex_input_check = true;
@ -706,19 +703,21 @@ namespace rsx
RSXFragmentProgram load_fp_raw(u64 program_hash) RSXFragmentProgram load_fp_raw(u64 program_hash)
{ {
std::vector<u8> data; fs::file f(fmt::format("%s/raw/%llX.fp", root_path, program_hash));
std::string filename = fmt::format("%llX.fp", program_hash);
fs::file f(root_path + "/raw/" + filename);
if (f) f.read(data, f.size());
RSXFragmentProgram fp = {}; RSXFragmentProgram fp = {};
fp.ucode_length = ::size32(data);
const u32 size = fp.ucode_length = f ? ::size32(f) : 0;
if (!size)
{ {
std::lock_guard lock(fpd_mutex); return fp;
fp.data = fragment_program_data.insert_or_assign(program_hash, std::move(data)).first->second.data();
} }
auto buf = std::make_unique<u8[]>(size);
fp.data = buf.get();
f.read(buf.get(), size);
fragment_program_data[fragment_program_data.push_begin()] = std::move(buf);
return fp; return fp;
} }