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

rsx: Allow to configure vblank rate

Browse source 
Removed "HLE protection" hack from sys_rsx_context_attribute
This commit is contained in:
Eladash 2019-07-11 08:34:15 +03:00 • committed by kd-11
parent efbae02a22
commit c4d8ef4340
4 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
View file

@ -250,10 +250,6 @@ error_code sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64
const auto render = rsx::get_current_renderer(); const auto render = rsx::get_current_renderer();
//hle protection
if (render->isHLE)
return CELL_OK;
auto m_sysrsx = fxm::get<SysRsxConfig>(); auto m_sysrsx = fxm::get<SysRsxConfig>();
if (!m_sysrsx) if (!m_sysrsx)

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

@ -456,37 +456,59 @@ namespace rsx
last_flip_time = get_system_time() - 1000000; last_flip_time = get_system_time() - 1000000;
vblank_count = 0;
thread_ctrl::spawn("VBlank Thread", [this]() thread_ctrl::spawn("VBlank Thread", [this]()
{ {
const u64 start_time = get_system_time(); // See sys_timer_usleep for details
#ifdef __linux__
constexpr u32 host_min_quantum = 50;
#else
constexpr u32 host_min_quantum = 500;
#endif
u64 start_time = get_system_time();
vblank_count = 0; const u64 period_time = 1000000 / g_cfg.video.vblank_rate;
const u64 wait_sleep = period_time - u64{period_time >= host_min_quantum} * host_min_quantum;
// TODO: exit condition // TODO: exit condition
while (!Emu.IsStopped() && !m_rsx_thread_exiting) while (!Emu.IsStopped() && !m_rsx_thread_exiting)
{ {
if (get_system_time() - start_time > vblank_count * 1000000 / 60) if (get_system_time() - start_time >= period_time)
{ {
vblank_count++; do
sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
if (vblank_handler)
{ {
intr_thread->cmd_list start_time += period_time;
({
{ ppu_cmd::set_args, 1 }, u64{1},
{ ppu_cmd::lle_call, vblank_handler },
{ ppu_cmd::sleep, 0 }
});
thread_ctrl::notify(*intr_thread); if (isHLE)
{
vblank_count++;
if (vblank_handler)
{
intr_thread->cmd_list
({
{ ppu_cmd::set_args, 1 }, u64{1},
{ ppu_cmd::lle_call, vblank_handler },
{ ppu_cmd::sleep, 0 }
});
thread_ctrl::notify(*intr_thread);
}
}
else
{
sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
}
} }
while (get_system_time() - start_time >= period_time);
std::this_thread::sleep_for(16ms); thread_ctrl::wait_for(wait_sleep);
continue; continue;
} }
while (Emu.IsPaused() && !m_rsx_thread_exiting) while (Emu.IsPaused() && !m_rsx_thread_exiting)
std::this_thread::sleep_for(16ms); thread_ctrl::wait_for(wait_sleep);
thread_ctrl::wait_for(100); // Hack thread_ctrl::wait_for(100); // Hack
} }

4
rpcs3/Emu/RSX/RSXThread.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <deque> #include <deque>
#include <variant> #include <variant>
@ -549,7 +549,7 @@ namespace rsx
vm::ptr<void(u32)> flip_handler = vm::null; vm::ptr<void(u32)> flip_handler = vm::null;
vm::ptr<void(u32)> user_handler = vm::null; vm::ptr<void(u32)> user_handler = vm::null;
vm::ptr<void(u32)> vblank_handler = vm::null; vm::ptr<void(u32)> vblank_handler = vm::null;
u64 vblank_count; atomic_t<u64> vblank_count;
public: public:
bool invalid_command_interrupt_raised = false; bool invalid_command_interrupt_raised = false;

1
rpcs3/Emu/System.h
View file

@ -477,6 +477,7 @@ struct cfg_root : cfg::node
cfg::_int<0, 16> anisotropic_level_override{this, "Anisotropic Filter Override", 0}; cfg::_int<0, 16> anisotropic_level_override{this, "Anisotropic Filter Override", 0};
cfg::_int<1, 1024> min_scalable_dimension{this, "Minimum Scalable Dimension", 16}; cfg::_int<1, 1024> min_scalable_dimension{this, "Minimum Scalable Dimension", 16};
cfg::_int<0, 30000000> driver_recovery_timeout{this, "Driver Recovery Timeout", 1000000}; cfg::_int<0, 30000000> driver_recovery_timeout{this, "Driver Recovery Timeout", 1000000};
cfg::_int<1, 500> vblank_rate{this, "Vblank Rate", 60}; // Changing this from 60 may affect game speed unexpected ways
struct node_d3d12 : cfg::node struct node_d3d12 : cfg::node
{ {