mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify core_run

Browse Source
This commit is contained in:
twinaphex 2019-06-22 19:52:06 +02:00
parent 5df3b1e221
commit 4664e56ca3
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
retroarch.c
View File

@ -1690,7 +1690,7 @@ bool recording_init(void)
params.pix_fmt = FFEMU_PIX_ARGB8888; params.pix_fmt = FFEMU_PIX_ARGB8888;
rarch_softfilter_get_max_output_size( rarch_softfilter_get_max_output_size(
video_driver_frame_filter_get_ptr(), video_driver_state_filter,
&max_width, &max_height); &max_width, &max_height);
params.fb_width = next_pow2(max_width); params.fb_width = next_pow2(max_width);
params.fb_height = next_pow2(max_height); params.fb_height = next_pow2(max_height);
@ -9124,11 +9124,6 @@ void video_driver_set_aspect_ratio_value(float value)
video_driver_aspect_ratio = value; video_driver_aspect_ratio = value;
} }
rarch_softfilter_t *video_driver_frame_filter_get_ptr(void)
{
return video_driver_state_filter;
}
enum retro_pixel_format video_driver_get_pixel_format(void) enum retro_pixel_format video_driver_get_pixel_format(void)
{ {
return video_driver_pix_fmt; return video_driver_pix_fmt;
@ -18119,8 +18114,13 @@ bool core_unload_game(void)
bool core_run(void) bool core_run(void)
{ {
bool early_polling = current_core.poll_type == POLL_TYPE_EARLY;
bool late_polling = current_core.poll_type == POLL_TYPE_LATE;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_PRE_FRAME, NULL)) bool netplay_preframe = netplay_driver_ctl(
RARCH_NETPLAY_CTL_PRE_FRAME, NULL);
if (!netplay_preframe)
{ {
/* Paused due to netplay. We must poll and display something so that a /* Paused due to netplay. We must poll and display something so that a
* netplay peer pausing doesn't just hang. */ * netplay peer pausing doesn't just hang. */
@ -18130,21 +18130,14 @@ bool core_run(void)
} }
#endif #endif
switch (current_core.poll_type) if (early_polling)
{ input_poll();
case POLL_TYPE_EARLY: else if (late_polling)
input_poll(); current_core.input_polled = false;
break;
case POLL_TYPE_LATE:
current_core.input_polled = false;
break;
default:
break;
}
current_core.retro_run(); current_core.retro_run();
if (current_core.poll_type == POLL_TYPE_LATE && !current_core.input_polled) if (late_polling && !current_core.input_polled)
input_poll(); input_poll();
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING

2
retroarch.h
View File

@ -1792,8 +1792,6 @@ float video_driver_get_aspect_ratio(void);
void video_driver_set_aspect_ratio_value(float value); void video_driver_set_aspect_ratio_value(float value);
rarch_softfilter_t *video_driver_frame_filter_get_ptr(void);
enum retro_pixel_format video_driver_get_pixel_format(void); enum retro_pixel_format video_driver_get_pixel_format(void);
void video_driver_set_pixel_format(enum retro_pixel_format fmt); void video_driver_set_pixel_format(enum retro_pixel_format fmt);