mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10771 from guoyunhe/key-format

Browse Source 
Change keys to upper case
This commit is contained in:
Autechre 2020-06-03 14:05:41 +02:00 committed by GitHub
commit cfcb107caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_ctr.c
View File

@ -171,7 +171,7 @@ static void frontend_ctr_deinit(void* data)
/* Only O3DS and O3DSXL support running in 'dual-framebuffer'
* mode with the parallax barrier disabled
* (i.e. these are the only platforms that can use
* CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */
* CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */
CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */
if ((device_model == 0) || (device_model == 1))
{

4
gfx/common/ctr_common.h
View File

@ -45,8 +45,8 @@ typedef enum
{
CTR_VIDEO_MODE_3D = 0,
CTR_VIDEO_MODE_2D,
CTR_VIDEO_MODE_2D_400x240,
CTR_VIDEO_MODE_2D_800x240,
CTR_VIDEO_MODE_2D_400X240,
CTR_VIDEO_MODE_2D_800X240,
CTR_VIDEO_MODE_LAST
} ctr_video_mode_enum;

18
gfx/drivers/ctr_gfx.c
View File

@ -87,8 +87,8 @@ static INLINE void ctr_check_3D_slider(ctr_video_t* ctr, ctr_video_mode_enum vid
ctr->enable_3d = true;
}
break;
case CTR_VIDEO_MODE_2D_400x240:
case CTR_VIDEO_MODE_2D_800x240:
case CTR_VIDEO_MODE_2D_400X240:
case CTR_VIDEO_MODE_2D_800X240:
if (ctr->supports_parallax_disable)
{
ctr->video_mode = video_mode;
@ -269,7 +269,7 @@ static void ctr_lcd_aptHook(APT_HookType hook, void* param)
ctr->p3d_event_pending = false;
}
if((hook == APTHOOK_ONSUSPEND) && (ctr->video_mode == CTR_VIDEO_MODE_2D_400x240))
if((hook == APTHOOK_ONSUSPEND) && (ctr->video_mode == CTR_VIDEO_MODE_2D_400X240))
{
memcpy(gfxTopRightFramebuffers[ctr->current_buffer_top],
gfxTopLeftFramebuffers[ctr->current_buffer_top],
@ -483,7 +483,7 @@ static void* ctr_init(const video_info_t* video,
/* Only O3DS and O3DSXL support running in 'dual-framebuffer'
* mode with the parallax barrier disabled
* (i.e. these are the only platforms that can use
* CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */
* CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */
CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */
ctr->supports_parallax_disable = (device_model == 0) || (device_model == 1);
@ -810,7 +810,7 @@ static bool ctr_frame(void* data, const void* frame,
GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left),
0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT,
ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
if (ctr->video_mode == CTR_VIDEO_MODE_3D)
{
@ -859,7 +859,7 @@ static bool ctr_frame(void* data, const void* frame,
GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left),
0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT,
ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1);
if (ctr->video_mode == CTR_VIDEO_MODE_3D)
@ -895,11 +895,11 @@ static bool ctr_frame(void* data, const void* frame,
ctrGuDisplayTransfer(true, ctr->drawbuffers.top.left,
240,
ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? 800 : 400,
ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? 800 : 400,
CTRGU_RGBA8,
gfxTopLeftFramebuffers[ctr->current_buffer_top], 240, CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
if ((ctr->video_mode == CTR_VIDEO_MODE_2D_400x240) || (ctr->video_mode == CTR_VIDEO_MODE_3D))
if ((ctr->video_mode == CTR_VIDEO_MODE_2D_400X240) || (ctr->video_mode == CTR_VIDEO_MODE_3D))
ctrGuDisplayTransfer(true, ctr->drawbuffers.top.right,
240,
400,
@ -913,7 +913,7 @@ static bool ctr_frame(void* data, const void* frame,
topFramebufferInfo.
framebuf0_vaddr = (u32*)gfxTopLeftFramebuffers[ctr->current_buffer_top];
if(ctr->video_mode == CTR_VIDEO_MODE_2D_800x240)
if(ctr->video_mode == CTR_VIDEO_MODE_2D_800X240)
{
topFramebufferInfo.
framebuf1_vaddr = (u32*)(gfxTopLeftFramebuffers[ctr->current_buffer_top] + 240 * 3);

2
gfx/drivers_display/gfx_display_ctr.c
View File

@ -112,7 +112,7 @@ static void gfx_display_ctr_draw(gfx_display_ctx_draw_t *draw,
GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left),
0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT,
ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ?
ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ?
CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1);

2
gfx/drivers_font/ctr_font.c
View File

@ -263,7 +263,7 @@ static void ctr_font_render_line(
GPU_SetViewport(NULL,
VIRT_TO_PHYS(ctr->drawbuffers.top.left),
0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT,
ctr->video_mode == CTR_VIDEO_MODE_2D_800x240
ctr->video_mode == CTR_VIDEO_MODE_2D_800X240
? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH);
GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current);

4
intl/msg_hash_chs.h
View File

@ -8579,11 +8579,11 @@ MSG_HASH(
"3DS 显示模式"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2D (像素效果)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2D (高分辨率)"
)
#endif

4
intl/msg_hash_es.h
View File

@ -10227,11 +10227,11 @@ MSG_HASH(
"Selecciona el modo de pantalla 2D o 3D. En el modo 3D, los píxeles serán rectangulares y se aplicará un efecto de profundidad al usar el menú rápido. El modo 2D es el mejor para el rendimiento."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2D (Efecto de cuadrícula de píxeles)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2D (Alta resolución)"
)
#endif

4
intl/msg_hash_fr.h
View File

@ -10241,11 +10241,11 @@ MSG_HASH(
"Sélectionne le mode d'affichage entre les modes 2D et 3D. En mode '3D', les pixels sont carrés et un effet de profondeur est appliqué lors de l'affichage du menu rapide. Le mode '2D' offre la meilleure performance."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2D (Effet grille de pixels)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2D (Haute résolution)"
)
#endif

4
intl/msg_hash_pl.h
View File

@ -10177,11 +10177,11 @@ MSG_HASH(
"Wybiera pomiędzy trybami wyświetlania 3D i 2D. W trybie '3D' piksele są kwadratowe a podczas przeglądania szybkiego menu zastosowany jest efekt głębi. Tryb „2D” zapewnia najlepszą wydajność."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2D (efekt siatki pikseli)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2D (wysoka rozdzielczość)"
)
#endif

4
intl/msg_hash_tr.h
View File

@ -10281,11 +10281,11 @@ MSG_HASH(
"2B"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2B (Piksel Izgara Efekti)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2B (Yüksek Çözünürlük)"
)
#endif

4
intl/msg_hash_us.h
View File

@ -10941,11 +10941,11 @@ MSG_HASH(
"2D"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
"2D (Pixel Grid Effect)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
"2D (High Resolution)"
)
#endif

10
menu/menu_setting.c
View File

@ -4839,16 +4839,16 @@ static void setting_get_string_representation_uint_video_3ds_display_mode(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D),
len);
break;
case CTR_VIDEO_MODE_2D_400x240:
case CTR_VIDEO_MODE_2D_400X240:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240),
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240),
len);
break;
case CTR_VIDEO_MODE_2D_800x240:
case CTR_VIDEO_MODE_2D_800X240:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240),
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240),
len);
break;
}
@ -14819,7 +14819,7 @@ static bool setting_append_list(
/* Only O3DS and O3DSXL support running in 'dual-framebuffer'
* mode with the parallax barrier disabled
* (i.e. these are the only platforms that can use
* CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */
* CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */
CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */
CONFIG_UINT(

4
msg_hash.h
View File

@ -1121,8 +1121,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_3D,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240,
MENU_ENUM_LABEL_FILE_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,