From 75330a142d5df1675067b1bd295caf28af21b5e5 Mon Sep 17 00:00:00 2001 From: Mikael Brunnhede Date: Tue, 5 Jun 2018 10:51:51 +0200 Subject: [PATCH 1/5] Implement fix for thumbnails not showing up in Quick Menu as well as "Run" menu after closing content. Also implement fix for savestate thumbnail being hidden behind boxart/screenshot thumbnails. With this fix, boxart/screenshot thumbnails are not shown on the right hand side if there is a savestate screenshot being rendered. --- menu/drivers/xmb.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index d73bbaaa73..8bab62df2e 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2163,12 +2163,18 @@ static void xmb_populate_entries(void *data, xmb_selection_pointer_changed(xmb, false); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL); if (!string_is_equal(xmb_thumbnails_ident('R'), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + { + xmb_update_thumbnail_path(xmb, 0, 'R'); xmb_update_thumbnail_image(xmb); + } xmb_update_savestate_thumbnail_image(xmb); if (!string_is_equal(xmb_thumbnails_ident('L'), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + { + xmb_update_thumbnail_path(xmb, 0, 'L'); xmb_update_thumbnail_image(xmb); + } return; } @@ -3066,7 +3072,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) } /* Right thumbnail big size */ - if (xmb->use_ps3_layout && + if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && (!settings->bools.menu_xmb_vertical_thumbnails || (settings->bools.menu_xmb_vertical_thumbnails && !xmb->left_thumbnail))) { @@ -3205,7 +3211,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) } /* No Right Thumbnail, draw only the left one big size */ - if (xmb->use_ps3_layout && + if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && settings->bools.menu_xmb_vertical_thumbnails && !xmb->thumbnail) { /* Do not draw the left thumbnail if there is no space available */ @@ -3514,7 +3520,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) /* Right side 2 thumbnails on top of each other */ /* here to be displayed above the horizontal icons */ - if (xmb->use_ps3_layout && + if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && xmb->left_thumbnail && xmb->thumbnail && settings->bools.menu_xmb_vertical_thumbnails) { @@ -4472,11 +4478,17 @@ static void xmb_context_reset(void *data, bool is_threaded) xmb_context_reset_horizontal_list(xmb); if (!string_is_equal(xmb_thumbnails_ident('R'), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + { + xmb_update_thumbnail_path(xmb, 0, 'R'); xmb_update_thumbnail_image(xmb); - if (!string_is_equal(xmb_thumbnails_ident('R'), - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + } + if (!string_is_equal(xmb_thumbnails_ident('L'), + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))) + { + xmb_update_thumbnail_path(xmb, 0, 'L'); xmb_update_thumbnail_image(xmb); + } xmb_update_savestate_thumbnail_image(xmb); free(iconpath); From 0813de0392dca3b34abccd0a5361a8d0bcbad069 Mon Sep 17 00:00:00 2001 From: Mikael Brunnhede Date: Wed, 6 Jun 2018 23:48:07 +0200 Subject: [PATCH 2/5] Hide thumbnails in Quick Menu sub-menus. --- menu/drivers/xmb.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 8bab62df2e..d6c93e200d 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2981,6 +2981,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) float pseudo_font_length = 0.0f; xmb_handle_t *xmb = (xmb_handle_t*)data; settings_t *settings = config_get_ptr(); + unsigned xmb_system_tab = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr); + bool hide_thumbnails = false; if (!xmb) return; @@ -3071,8 +3073,14 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) xmb->savestate_thumbnail); } + /* This is used for hiding thumbnails when going into sub-levels in the + * Quick Menu as well as when selecting "Information" for a playlist entry. + * NOTE: This is currently a pretty crude check, simply going by menu depth + * and not specifically identifying which menu we're actually in. */ + hide_thumbnails = xmb_system_tab > XMB_SYSTEM_TAB_SETTINGS && xmb->depth > 2; + /* Right thumbnail big size */ - if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && + if (!hide_thumbnails && !xmb->savestate_thumbnail && xmb->use_ps3_layout && (!settings->bools.menu_xmb_vertical_thumbnails || (settings->bools.menu_xmb_vertical_thumbnails && !xmb->left_thumbnail))) { @@ -3143,7 +3151,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) /* Left thumbnail in the left margin */ /* Do not draw the left thumbnail if there is no space available */ - if (xmb->use_ps3_layout && + if (!hide_thumbnails && xmb->use_ps3_layout && !settings->bools.menu_xmb_vertical_thumbnails && (xmb->margins_screen_top + xmb->icon_size * (!(xmb->depth == 1)? 2.1 : 1) + min_thumb_size) @@ -3211,7 +3219,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) } /* No Right Thumbnail, draw only the left one big size */ - if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && + if (!hide_thumbnails && !xmb->savestate_thumbnail && xmb->use_ps3_layout && settings->bools.menu_xmb_vertical_thumbnails && !xmb->thumbnail) { /* Do not draw the left thumbnail if there is no space available */ @@ -3281,7 +3289,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) /* PSP Layout Only - Left thumbnail in the left margin */ /* Do not draw the left thumbnail if there is no space available */ - if (!xmb->use_ps3_layout && + if (!hide_thumbnails && !xmb->use_ps3_layout && (xmb->margins_screen_top + xmb->icon_size * 1.5) <= (float)height) { @@ -3520,7 +3528,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) /* Right side 2 thumbnails on top of each other */ /* here to be displayed above the horizontal icons */ - if (!xmb->savestate_thumbnail && xmb->use_ps3_layout && + if (!hide_thumbnails && !xmb->savestate_thumbnail && xmb->use_ps3_layout && xmb->left_thumbnail && xmb->thumbnail && settings->bools.menu_xmb_vertical_thumbnails) { From 6ede99b47bb6a45d370773c76c5bf17b81a568dc Mon Sep 17 00:00:00 2001 From: FIX94 Date: Thu, 7 Jun 2018 21:04:34 +0200 Subject: [PATCH 3/5] (GC) ACTUALLY fix up build --- frontend/drivers/platform_gx.c | 2 -- griffin/griffin.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c index ba480c3af3..3da5102977 100644 --- a/frontend/drivers/platform_gx.c +++ b/frontend/drivers/platform_gx.c @@ -310,9 +310,7 @@ static void frontend_gx_init(void *data) __exception_setreload(8); #endif -#ifdef HW_RVL fatInitDefault(); -#endif #ifdef HAVE_LOGGER devoptab_list[STD_OUT] = &dotab_stdout; diff --git a/griffin/griffin.c b/griffin/griffin.c index 760184d899..23d9706e5a 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -72,7 +72,6 @@ CONSOLE EXTENSIONS #endif #ifdef INTERNAL_LIBOGC -#ifdef HW_RVL #include "../wii/libogc/libfat/cache.c" #include "../wii/libogc/libfat/directory.c" #include "../wii/libogc/libfat/disc.c" @@ -84,7 +83,6 @@ CONSOLE EXTENSIONS #include "../wii/libogc/libfat/lock.c" #include "../wii/libogc/libfat/partition.c" #endif -#endif #endif From 3f04c639b474667fed0fdd0dd3cef49dcd34ee95 Mon Sep 17 00:00:00 2001 From: altiereslima Date: Sun, 10 Jun 2018 19:58:50 -0300 Subject: [PATCH 4/5] Update portuguese brazilian translation. --- intl/msg_hash_pt_br.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index f2e86421b3..fb4c083f66 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -3717,12 +3717,12 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_PAUSE, MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME, "Continuar conquistas para a sessão atual (Esta ação desabilitará Estados de Jogos, Trapaças, Rebobinagem, Pausa e Câmera Lenta e reiniciará o jogo atual).") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU, - "In-Menu") + "No Menu") MSG_HASH( MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW, - "Enable Discord" + "Habilitar o Discord" ) MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, - "Enable or disable Discord support. Will not work with the browser version, only native desktop client." + "Habilitar ou desabilitar o suporte ao Discord. Não funcionará com a versão do navegador, apenas o cliente nativo de desktop." ) From ab9e00219d0dac7f2962feed963fa778080c97c9 Mon Sep 17 00:00:00 2001 From: bparker06 Date: Mon, 11 Jun 2018 20:28:36 -0400 Subject: [PATCH 5/5] Add null pointer check --- libretro-common/gfx/gl_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-common/gfx/gl_capabilities.c b/libretro-common/gfx/gl_capabilities.c index d7ec069e4b..8eea056584 100644 --- a/libretro-common/gfx/gl_capabilities.c +++ b/libretro-common/gfx/gl_capabilities.c @@ -311,7 +311,7 @@ bool gl_check_capability(enum gl_capability_enum enum_idx) if (major >= 3) return true; #else - if (strstr(vendor, "ATI Technologies")) + if (vendor && strstr(vendor, "ATI Technologies")) return false; if (gl_query_extension("ARB_texture_storage")) return true;