ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qt_grid

This commit is contained in:
Brad Parker 2018-06-12 20:49:50 -04:00
parent ef8390dee1 ab9e00219d
commit 19dd1c15eb
5 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_gx.c
View File

@ -310,9 +310,7 @@ static void frontend_gx_init(void *data)
__exception_setreload(8); __exception_setreload(8);
#endif #endif
#ifdef HW_RVL
fatInitDefault(); fatInitDefault();
#endif
#ifdef HAVE_LOGGER #ifdef HAVE_LOGGER
devoptab_list[STD_OUT] = &dotab_stdout; devoptab_list[STD_OUT] = &dotab_stdout;

2
griffin/griffin.c
View File

@ -72,7 +72,6 @@ CONSOLE EXTENSIONS
#endif #endif
#ifdef INTERNAL_LIBOGC #ifdef INTERNAL_LIBOGC
#ifdef HW_RVL
#include "../wii/libogc/libfat/cache.c" #include "../wii/libogc/libfat/cache.c"
#include "../wii/libogc/libfat/directory.c" #include "../wii/libogc/libfat/directory.c"
#include "../wii/libogc/libfat/disc.c" #include "../wii/libogc/libfat/disc.c"
@ -84,7 +83,6 @@ CONSOLE EXTENSIONS
#include "../wii/libogc/libfat/lock.c" #include "../wii/libogc/libfat/lock.c"
#include "../wii/libogc/libfat/partition.c" #include "../wii/libogc/libfat/partition.c"
#endif #endif
#endif
#endif #endif

6
intl/msg_hash_pt_br.h
View File

@ -3717,12 +3717,12 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_PAUSE,
MSG_HASH(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME, 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).") "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, MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
"In-Menu") "No Menu")
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW, MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
"Enable Discord" "Habilitar o Discord"
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_DISCORD_ALLOW, 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."
) )

2
libretro-common/gfx/gl_capabilities.c
View File

@ -311,7 +311,7 @@ bool gl_check_capability(enum gl_capability_enum enum_idx)
if (major >= 3) if (major >= 3)
return true; return true;
#else #else
if (strstr(vendor, "ATI Technologies")) if (vendor && strstr(vendor, "ATI Technologies"))
return false; return false;
if (gl_query_extension("ARB_texture_storage")) if (gl_query_extension("ARB_texture_storage"))
return true; return true;

40
menu/drivers/xmb.c
View File

@ -2163,12 +2163,18 @@ static void xmb_populate_entries(void *data,
xmb_selection_pointer_changed(xmb, false); xmb_selection_pointer_changed(xmb, false);
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
if (!string_is_equal(xmb_thumbnails_ident('R'), 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_thumbnail_image(xmb);
}
xmb_update_savestate_thumbnail_image(xmb); xmb_update_savestate_thumbnail_image(xmb);
if (!string_is_equal(xmb_thumbnails_ident('L'), 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); xmb_update_thumbnail_image(xmb);
}
return; return;
} }
@ -2975,6 +2981,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
float pseudo_font_length = 0.0f; float pseudo_font_length = 0.0f;
xmb_handle_t *xmb = (xmb_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;
settings_t *settings = config_get_ptr(); 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) if (!xmb)
return; return;
@ -3065,8 +3073,14 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
xmb->savestate_thumbnail); 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 */ /* Right thumbnail big size */
if (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 ||
(settings->bools.menu_xmb_vertical_thumbnails && !xmb->left_thumbnail))) (settings->bools.menu_xmb_vertical_thumbnails && !xmb->left_thumbnail)))
{ {
@ -3137,7 +3151,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
/* Left thumbnail in the left margin */ /* Left thumbnail in the left margin */
/* Do not draw the left thumbnail if there is no space available */ /* 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 && !settings->bools.menu_xmb_vertical_thumbnails &&
(xmb->margins_screen_top + xmb->icon_size * (xmb->margins_screen_top + xmb->icon_size *
(!(xmb->depth == 1)? 2.1 : 1) + min_thumb_size) (!(xmb->depth == 1)? 2.1 : 1) + min_thumb_size)
@ -3205,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 */ /* No Right Thumbnail, draw only the left one big size */
if (xmb->use_ps3_layout && if (!hide_thumbnails && !xmb->savestate_thumbnail && xmb->use_ps3_layout &&
settings->bools.menu_xmb_vertical_thumbnails && !xmb->thumbnail) settings->bools.menu_xmb_vertical_thumbnails && !xmb->thumbnail)
{ {
/* Do not draw the left thumbnail if there is no space available */ /* Do not draw the left thumbnail if there is no space available */
@ -3275,7 +3289,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
/* PSP Layout Only - Left thumbnail in the left margin */ /* PSP Layout Only - Left thumbnail in the left margin */
/* Do not draw the left thumbnail if there is no space available */ /* 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) (xmb->margins_screen_top + xmb->icon_size * 1.5)
<= (float)height) <= (float)height)
{ {
@ -3514,7 +3528,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
/* Right side 2 thumbnails on top of each other */ /* Right side 2 thumbnails on top of each other */
/* here to be displayed above the horizontal icons */ /* here to be displayed above the horizontal icons */
if (xmb->use_ps3_layout && if (!hide_thumbnails && !xmb->savestate_thumbnail && xmb->use_ps3_layout &&
xmb->left_thumbnail && xmb->thumbnail && xmb->left_thumbnail && xmb->thumbnail &&
settings->bools.menu_xmb_vertical_thumbnails) settings->bools.menu_xmb_vertical_thumbnails)
{ {
@ -4472,11 +4486,17 @@ static void xmb_context_reset(void *data, bool is_threaded)
xmb_context_reset_horizontal_list(xmb); xmb_context_reset_horizontal_list(xmb);
if (!string_is_equal(xmb_thumbnails_ident('R'), 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_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_thumbnail_image(xmb);
}
xmb_update_savestate_thumbnail_image(xmb); xmb_update_savestate_thumbnail_image(xmb);
free(iconpath); free(iconpath);