ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rsx: Correctly count number of valid entries if there are broken entries in the cache

This commit is contained in:
kd-11 2019-06-06 13:26:33 +03:00 committed by kd-11
parent bca5f94b3f
commit 9d314ca4ca
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,7 +571,7 @@ namespace rsx
// Preload everything needed to compile the shaders // Preload everything needed to compile the shaders
// Can probably be parallelized too, but since it's mostly reading files it's probably not worth it // Can probably be parallelized too, but since it's mostly reading files it's probably not worth it
std::vector<std::tuple<pipeline_storage_type, RSXVertexProgram, RSXFragmentProgram>> unpackeds; std::vector<std::tuple<pipeline_storage_type, RSXVertexProgram, RSXFragmentProgram>> unpacked;
std::chrono::time_point<steady_clock> last_update; std::chrono::time_point<steady_clock> last_update;
u32 processed_since_last_update = 0; u32 processed_since_last_update = 0;
@ -590,9 +590,9 @@ namespace rsx
} }
f.read<u8>(bytes, f.size()); f.read<u8>(bytes, f.size());
auto unpacked = unpack(*(pipeline_data*)bytes.data()); auto entry = unpack(*(pipeline_data*)bytes.data());
m_storage.preload_programs(std::get<1>(unpacked), std::get<2>(unpacked)); m_storage.preload_programs(std::get<1>(entry), std::get<2>(entry));
unpackeds.push_back(unpacked); unpacked.push_back(entry);
// Only update the screen at about 10fps since updating it everytime slows down the process // Only update the screen at about 10fps since updating it everytime slows down the process
std::chrono::time_point<steady_clock> now = std::chrono::steady_clock::now(); std::chrono::time_point<steady_clock> now = std::chrono::steady_clock::now();
@ -606,14 +606,17 @@ namespace rsx
} }
} }
// Account for any invalid entries
entry_count = u32(unpacked.size());
atomic_t<u32> processed(0); atomic_t<u32> processed(0);
std::function<void(u32)> shader_comp_worker = [&](u32 index) std::function<void(u32)> shader_comp_worker = [&](u32 index)
{ {
u32 pos; u32 pos;
while (((pos = processed++) < entry_count) && !Emu.IsStopped()) while (((pos = processed++) < entry_count) && !Emu.IsStopped())
{ {
auto unpacked = unpackeds[pos]; auto& entry = unpacked[pos];
m_storage.add_pipeline_entry(std::get<1>(unpacked), std::get<2>(unpacked), std::get<0>(unpacked), std::forward<Args>(args)...); m_storage.add_pipeline_entry(std::get<1>(entry), std::get<2>(entry), std::get<0>(entry), std::forward<Args>(args)...);
} }
}; };
@ -653,8 +656,8 @@ namespace rsx
u32 pos; u32 pos;
while (((pos = processed++) < entry_count) && !Emu.IsStopped()) while (((pos = processed++) < entry_count) && !Emu.IsStopped())
{ {
auto unpacked = unpackeds[pos]; auto& entry = unpacked[pos];
m_storage.add_pipeline_entry(std::get<1>(unpacked), std::get<2>(unpacked), std::get<0>(unpacked), std::forward<Args>(args)...); m_storage.add_pipeline_entry(std::get<1>(entry), std::get<2>(entry), std::get<0>(entry), std::forward<Args>(args)...);
// Update screen at about 10fps // Update screen at about 10fps
std::chrono::time_point<steady_clock> now = std::chrono::steady_clock::now(); std::chrono::time_point<steady_clock> now = std::chrono::steady_clock::now();