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

Go back to this

Browse Source
This commit is contained in:
twinaphex 2017-01-22 23:19:35 +01:00
parent d3707fe3b0
commit a104c73738
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/drivers/gl.c
View File

@ -1166,7 +1166,7 @@ static bool gl_frame(void *data, const void *frame,
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
/* Can be NULL for frame dupe / NULL render. */
if (frame && video_info->libretro_running)
if (frame)
{
#ifdef HAVE_FBO
if (!gl->hw_render_fbo_init)

2
gfx/drivers/vulkan.c
View File

@ -1597,7 +1597,7 @@ static bool vulkan_frame(void *data, const void *frame,
/* Upload texture */
performance_counter_start(&copy_frame);
if (frame && !vk->hw.enable && video_info->libretro_running)
if (frame && !vk->hw.enable)
{
unsigned y;
uint8_t *dst = NULL;

2
gfx/video_driver.c
View File

@ -2307,8 +2307,6 @@ void video_driver_build_info(video_frame_info_t *video_info)
if (!settings->menu.pause_libretro)
video_info->libretro_running = (rarch_ctl(RARCH_CTL_IS_INITED, NULL)
&& !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL));
else if (!video_info->menu_is_alive)
video_info->libretro_running = true;
#else
video_info->menu_is_alive = false;
video_info->menu_footer_opacity = 0.0f;

12
runloop.c
View File

@ -689,7 +689,6 @@ static enum runloop_state runloop_check_state(
uint64_t current_input,
uint64_t old_input,
uint64_t trigger_input,
bool menu_is_alive,
unsigned *sleep_ms)
{
static bool old_focus = true;
@ -707,7 +706,7 @@ static enum runloop_state runloop_check_state(
if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
{
bool fullscreen_toggled = !runloop_paused || menu_is_alive;
bool fullscreen_toggled = !runloop_paused || menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL);
if (fullscreen_toggled)
command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
@ -758,7 +757,7 @@ static enum runloop_state runloop_check_state(
}
#ifdef HAVE_MENU
if (menu_is_alive)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
{
menu_ctx_iterate_t iter;
core_poll();
@ -795,7 +794,7 @@ static enum runloop_state runloop_check_state(
#ifdef HAVE_MENU
if (menu_event_kb_is_set(RETROK_F1) == 1)
{
if (menu_is_alive)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
{
if (rarch_ctl(RARCH_CTL_IS_INITED, NULL) &&
!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
@ -809,7 +808,7 @@ static enum runloop_state runloop_check_state(
runloop_cmd_triggered(trigger_input, RARCH_MENU_TOGGLE)) ||
rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
{
if (menu_is_alive)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
{
if (rarch_ctl(RARCH_CTL_IS_INITED, NULL) &&
!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
@ -824,7 +823,7 @@ static enum runloop_state runloop_check_state(
else
menu_event_kb_set(false, RETROK_F1);
if (menu_is_alive)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
{
if (!settings->menu.throttle_framerate && !settings->fastforward_ratio)
return RUNLOOP_STATE_MENU_ITERATE;
@ -1090,7 +1089,6 @@ int runloop_iterate(unsigned *sleep_ms)
current_input,
old_input,
trigger_input,
menu_is_alive,
sleep_ms))
{
case RUNLOOP_STATE_QUIT: