mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6071 from fr500/master

Browse Source 
Disable hard sync on FF without mangling settings"
This commit is contained in:
Twinaphex 2018-01-09 03:43:33 +01:00 committed by GitHub
commit bf1bd83631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/drivers/gl.c
View File

@ -1202,7 +1202,8 @@ static bool gl_frame(void *data, const void *frame,
video_info->cb_swap_buffers(video_info->context_data, video_info);
if (video_info->hard_sync && gl->have_sync)
/* check if we are fast forwarding, if we are ignore hard sync */
if (gl->have_sync && video_info->hard_sync && !video_info->input_driver_nonblock_state)
{
glClear(GL_COLOR_BUFFER_BIT);

13
retroarch.c
View File

@ -230,7 +230,6 @@ static bool runloop_remaps_game_active = false;
static bool runloop_game_options_active = false;
static bool runloop_missing_bios = false;
static bool runloop_autosave = false;
static bool runloop_had_hard_sync = false;
static rarch_system_info_t runloop_system;
static struct retro_frame_time_callback runloop_frame_time;
@ -2802,18 +2801,6 @@ static enum runloop_state runloop_check_state(
runloop_msg_queue_push(
msg_hash_to_str(MSG_FAST_FORWARD), 1, 1, false);
/* Disable gpu hard sync in fast forward state for speed. */
if (runloop_fastmotion && settings->bools.video_hard_sync)
{
settings->bools.video_hard_sync = false;
runloop_had_hard_sync = true;
}
else if (!runloop_fastmotion && runloop_had_hard_sync)
{
settings->bools.video_hard_sync = true;
runloop_had_hard_sync = false;
}
old_button_state = new_button_state;
old_hold_button_state = new_hold_button_state;
}