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

rsx: Restructure flip code and frame scoping

Browse source 
- Add an explicit frame scope marker tied in with the queue_prepare command
  Since queue_prepare is emitted at the end of a frame, it can be used as end-of-frame in games that emit this
- If this command is not emitted, fifo flatenner and frameskip will not work
This commit is contained in:
kd-11 2019-09-17 14:26:03 +03:00 • committed by kd-11
parent c50119aefa
commit 2c76f47eec
3 changed files with 123 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2235,45 +2235,9 @@ namespace rsx
void thread::flip(int buffer, bool emu_flip)
{
if (!(async_flip_requested & flip_request::any))
if (async_flip_requested & flip_request::any)
{
// Flip is processed through inline FLIP command in the commandstream
// This is critical as it is a reliable end-of-frame marker
if (!g_cfg.video.disable_FIFO_reordering)
{
// Try to enable FIFO optimizations
// Only rarely useful for some games like RE4
m_flattener.evaluate_performance(m_draw_calls);
}
// Reset zcull ctrl
zcull_ctrl->set_active(this, false);
zcull_ctrl->clear(this);
if (zcull_ctrl->has_pending())
{
LOG_TRACE(RSX, "Dangling reports found, discarding...");
zcull_ctrl->sync(this);
}
if (g_cfg.video.frame_skip_enabled)
{
m_skip_frame_ctr++;
if (m_skip_frame_ctr == g_cfg.video.consequtive_frames_to_draw)
m_skip_frame_ctr = -g_cfg.video.consequtive_frames_to_skip;
skip_frame = (m_skip_frame_ctr < 0);
}
}
else
{
if (async_flip_requested & flip_request::emu_requested)
{
m_flattener.force_disable();
}
// Deferred flip
if (emu_flip)
{
async_flip_requested.clear(flip_request::emu_requested);
@ -2284,13 +2248,16 @@ namespace rsx
}
}
if (!skip_frame)
if (emu_flip)
{
// Reset counter
m_draw_calls = 0;
}
if (g_cfg.video.frame_skip_enabled)
{
skip_frame = (m_skip_frame_ctr < 0);
}
performance_counters.sampled_frames++;
m_draw_calls = 0;
performance_counters.sampled_frames++;
}
}
void thread::check_zcull_status(bool framebuffer_swap)
@ -2528,31 +2495,9 @@ namespace rsx
return performance_counters.approximate_load;
}
void thread::request_emu_flip(u32 buffer)
{
const bool is_rsxthr = std::this_thread::get_id() == m_rsx_thread;
// requested through command buffer
if (is_rsxthr)
{
// NOTE: The flip will clear any queued flip requests
handle_emu_flip(buffer);
}
else // requested 'manually' through ppu syscall
{
if (async_flip_requested & flip_request::emu_requested)
{
// ignore multiple requests until previous happens
return;
}
async_flip_buffer = buffer;
async_flip_requested |= flip_request::emu_requested;
}
}
void thread::handle_emu_flip(u32 buffer)
void thread::on_frame_end(u32 buffer, bool forced)
{
// Marks the end of a frame scope GPU-side
if (user_asked_for_frame_capture && !capture_current_frame)
{
capture_current_frame = true;
@ -2588,6 +2533,81 @@ namespace rsx
Emu.Pause();
}
// Reset zcull ctrl
zcull_ctrl->set_active(this, false);
zcull_ctrl->clear(this);
if (zcull_ctrl->has_pending())
{
LOG_TRACE(RSX, "Dangling reports found, discarding...");
zcull_ctrl->sync(this);
}
if (LIKELY(!forced))
{
if (!g_cfg.video.disable_FIFO_reordering)
{
// Try to enable FIFO optimizations
// Only rarely useful for some games like RE4
m_flattener.evaluate_performance(m_draw_calls);
}
if (g_cfg.video.frame_skip_enabled)
{
m_skip_frame_ctr++;
if (m_skip_frame_ctr == g_cfg.video.consequtive_frames_to_draw)
m_skip_frame_ctr = -g_cfg.video.consequtive_frames_to_skip;
}
}
else
{
if (!g_cfg.video.disable_FIFO_reordering)
{
// Flattener is unusable due to forced random flips
m_flattener.force_disable();
}
if (g_cfg.video.frame_skip_enabled)
{
LOG_ERROR(RSX, "Frame skip is not compatible with this application");
}
}
queued_flip_index = int(buffer);
}
void thread::request_emu_flip(u32 buffer)
{
const bool is_rsxthr = std::this_thread::get_id() == m_rsx_thread;
// requested through command buffer
if (is_rsxthr)
{
// NOTE: The flip will clear any queued flip requests
handle_emu_flip(buffer);
}
else // requested 'manually' through ppu syscall
{
if (async_flip_requested & flip_request::emu_requested)
{
// ignore multiple requests until previous happens
return;
}
async_flip_buffer = buffer;
async_flip_requested |= flip_request::emu_requested;
}
}
void thread::handle_emu_flip(u32 buffer)
{
if (queued_flip_index < 0)
{
// Frame was not queued before flipping
on_frame_end(buffer, true);
}
double limit = 0.;
switch (g_cfg.video.frame_limit)
{
@ -2634,6 +2654,7 @@ namespace rsx
last_flip_time = get_system_time() - 1000000;
flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
queued_flip_index = -1;
if (flip_handler)
{