mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 13:27:45 -07:00
Merge 137cf485b2
into 2c92e5b5b3
This commit is contained in:
commit
4b23efd110
@ -360,11 +360,6 @@ void CoreTimingManager::Throttle(const s64 target_cycle)
|
|||||||
{
|
{
|
||||||
// Based on number of cycles and emulation speed, increase the target deadline
|
// Based on number of cycles and emulation speed, increase the target deadline
|
||||||
const s64 cycles = target_cycle - m_throttle_last_cycle;
|
const s64 cycles = target_cycle - m_throttle_last_cycle;
|
||||||
|
|
||||||
// Prevent any throttling code if the amount of time passed is < ~0.122ms
|
|
||||||
if (cycles < m_throttle_min_clock_per_sleep)
|
|
||||||
return;
|
|
||||||
|
|
||||||
m_throttle_last_cycle = target_cycle;
|
m_throttle_last_cycle = target_cycle;
|
||||||
|
|
||||||
const double speed = Core::GetIsThrottlerTempDisabled() ? 0.0 : m_emulation_speed;
|
const double speed = Core::GetIsThrottlerTempDisabled() ? 0.0 : m_emulation_speed;
|
||||||
@ -442,7 +437,6 @@ void CoreTimingManager::LogPendingEvents() const
|
|||||||
void CoreTimingManager::AdjustEventQueueTimes(u32 new_ppc_clock, u32 old_ppc_clock)
|
void CoreTimingManager::AdjustEventQueueTimes(u32 new_ppc_clock, u32 old_ppc_clock)
|
||||||
{
|
{
|
||||||
m_throttle_clock_per_sec = new_ppc_clock;
|
m_throttle_clock_per_sec = new_ppc_clock;
|
||||||
m_throttle_min_clock_per_sleep = new_ppc_clock / 1200;
|
|
||||||
|
|
||||||
for (Event& ev : m_event_queue)
|
for (Event& ev : m_event_queue)
|
||||||
{
|
{
|
||||||
|
@ -203,7 +203,6 @@ private:
|
|||||||
s64 m_throttle_last_cycle = 0;
|
s64 m_throttle_last_cycle = 0;
|
||||||
TimePoint m_throttle_deadline = Clock::now();
|
TimePoint m_throttle_deadline = Clock::now();
|
||||||
s64 m_throttle_clock_per_sec = 0;
|
s64 m_throttle_clock_per_sec = 0;
|
||||||
s64 m_throttle_min_clock_per_sleep = 0;
|
|
||||||
bool m_throttle_disable_vi_int = false;
|
bool m_throttle_disable_vi_int = false;
|
||||||
|
|
||||||
DT m_max_fallback = {};
|
DT m_max_fallback = {};
|
||||||
|
Loading…
Reference in New Issue
Block a user