archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix zcull time to not time travel to the future

Browse source
This commit is contained in:
Eladash 2020-04-16 12:54:10 +03:00 • committed by Ivan
parent e095eaf16e
commit 833ace1190
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -34,6 +34,8 @@ rsx::frame_capture_data frame_capture;
extern CellGcmOffsetTable offsetTable; extern CellGcmOffsetTable offsetTable;
extern thread_local std::string(*g_tls_log_prefix)(); extern thread_local std::string(*g_tls_log_prefix)();
extern u64 sys_time_get_timebase_frequency();
extern u64 get_timebased_time();
namespace rsx namespace rsx
{ {
@ -811,8 +813,15 @@ namespace rsx
u64 thread::timestamp() u64 thread::timestamp()
{ {
// Get timestamp, and convert it from microseconds to nanoseconds const u64 freq = sys_time_get_timebase_frequency();
const u64 t = get_guest_system_time() * 1000;
auto get_time_ns = [freq]()
{
const u64 t = get_timebased_time();
return (t / freq * 1'000'000'000 + t % freq * 1'000'000'000 / freq);
};
const u64 t = get_time_ns();
if (t != timestamp_ctrl) if (t != timestamp_ctrl)
{ {
timestamp_ctrl = t; timestamp_ctrl = t;
@ -820,7 +829,23 @@ namespace rsx
return t; return t;
} }
timestamp_subvalue += 10; // Check if we passed the limit of what fixed increments is legal for
// Wait for the next time value reported if we passed the limit
if ((1'000'000'000 / freq) - timestamp_subvalue <= 2)
{
u64 now = get_time_ns();
for (; t == now; now = get_time_ns())
{
_mm_pause();
}
timestamp_ctrl = now;
timestamp_subvalue = 0;
return now;
}
timestamp_subvalue += 2;
return t + timestamp_subvalue; return t + timestamp_subvalue;
} }