From c7f8df9327f4c94332d7ddecf27529488c3016a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 22 Apr 2016 17:25:02 +0700 Subject: [PATCH] (Menu) Use MENU_DISPLAY_CTL_LIBRETRO_RUNNING in all menu drivers --- menu/drivers/materialui.c | 12 ++---------- menu/drivers/xmb.c | 6 ++---- menu/drivers/zarch.c | 8 ++------ 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index dc6089384c..1e94b0ad85 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -813,11 +813,7 @@ static void mui_frame(void *data) draw.vertex_count = 4; draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP; - if ( - (settings->menu.pause_libretro - || !rarch_ctl(RARCH_CTL_IS_INITED, NULL) - || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) - ) + if (!menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) && draw.texture) draw.color = &white_bg[0]; @@ -851,11 +847,7 @@ static void mui_frame(void *data) draw.vertex_count = 4; draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP; - if ( - (settings->menu.pause_libretro - || !rarch_ctl(RARCH_CTL_IS_INITED, NULL) - || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) - ) + if (!menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) && draw.texture) draw.color = &white_bg[0]; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index d1a9b7bfee..b65f505751 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1889,12 +1889,10 @@ static void xmb_draw_bg( draw.vertex_count = 4; draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP; - if ( - !menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) - && draw.texture) + if (!menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) + && draw.texture) draw.color = &coord_white[0]; - menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_SET_VIEWPORT, NULL); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 7d3f9ac89d..54c7c2c0f4 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -971,12 +971,8 @@ static void zarch_frame(void *data) draw.vertex_count = 4; draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP; - if ( - (settings->menu.pause_libretro - || !rarch_ctl(RARCH_CTL_IS_INITED, NULL) - || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) - ) - && draw.texture) + if (!menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO_RUNNING, NULL) + && draw.texture) draw.color = &coord_color2[0]; menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);