mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preemptive Frames: Call retro_run before retro_serialize (#14893)

Browse Source 
Fixes preemptive frames not starting up with a few cores
This commit is contained in:
neil4 2023-01-23 07:52:51 -06:00 committed by GitHub
parent b484ddfe4e
commit a734e66f72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runahead.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2023 - Daniel De Matteis * Copyright (C) 2011-2023 - Daniel De Matteis
* Copyright (C) 2018-2023 - Dan Weiss * Copyright (C) 2018-2023 - Dan Weiss
* Copyright (C) 2022-2023 - Neil4 * Copyright (C) 2022-2023 - Neil Fore
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found- * of the GNU General Public License as published by the Free Software Found-
@ -1451,6 +1451,11 @@ bool preempt_init(void *data)
runloop_st->flags &= ~(RUNLOOP_FLAG_RUNAHEAD_AVAILABLE runloop_st->flags &= ~(RUNLOOP_FLAG_RUNAHEAD_AVAILABLE
| RUNLOOP_FLAG_RUNAHEAD_SECONDARY_CORE_AVAILABLE); | RUNLOOP_FLAG_RUNAHEAD_SECONDARY_CORE_AVAILABLE);
/* Run at least one frame before attempting
* retro_serialize_size or retro_serialize */
if (video_state_get_ptr()->frame_count == 0)
runloop_st->current_core.retro_run();
/* Allocate - same 'frames' setting as runahead */ /* Allocate - same 'frames' setting as runahead */
if ((failed_str = preempt_allocate(runloop_st, if ((failed_str = preempt_allocate(runloop_st,
settings->uints.run_ahead_frames))) settings->uints.run_ahead_frames)))
@ -1466,7 +1471,7 @@ bool preempt_init(void *data)
error: error:
preempt_deinit(runloop_st); preempt_deinit(runloop_st);
if (!config_get_ptr()->bools.preemptive_frames_hide_warnings) if (!settings->bools.preemptive_frames_hide_warnings)
runloop_msg_queue_push( runloop_msg_queue_push(
failed_str, 0, 2 * 60, true, failed_str, 0, 2 * 60, true,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -1684,7 +1689,7 @@ error:
video_st->flags |= VIDEO_FLAG_ACTIVE; video_st->flags |= VIDEO_FLAG_ACTIVE;
preempt_deinit(runloop_st); preempt_deinit(runloop_st);
if (!config_get_ptr()->bools.preemptive_frames_hide_warnings) if (!settings->bools.preemptive_frames_hide_warnings)
runloop_msg_queue_push( runloop_msg_queue_push(
failed_str, 0, 2 * 60, true, failed_str, 0, 2 * 60, true,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);