Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Libretro] Adds some core options description + minor changes #1352

Merged
merged 1 commit into from
Dec 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion shell/libretro/libretro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,9 @@ static bool set_variable_visibility(void)
option_display.visible = platformIsArcade;
option_display.key = CORE_OPTION_NAME "_allow_service_buttons";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
option_display.visible = settings.platform.isNaomi();
option_display.key = CORE_OPTION_NAME "_force_freeplay";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);

// Show/hide Dreamcast options
option_display.visible = platformIsDreamcast;
Expand All @@ -437,6 +440,10 @@ static bool set_variable_visibility(void)
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
option_display.key = CORE_OPTION_NAME "_per_content_vmus";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
option_display.key = CORE_OPTION_NAME "_dc_32mb_mod";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
option_display.key = CORE_OPTION_NAME "_vmu_sound";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
option_display.visible = platformIsDreamcast || settings.platform.isAtomiswave();
option_display.key = CORE_OPTION_NAME "_emulate_bba";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
Expand Down Expand Up @@ -523,7 +530,7 @@ static bool set_variable_visibility(void)
bool textureUpscaleWasEnabled = textureUpscaleEnabled;
textureUpscaleEnabled = false;
var.key = CORE_OPTION_NAME "_texupscale";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && strcmp(var.value, "off"))
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && strcmp(var.value, "1"))
textureUpscaleEnabled = true;

if (first_run || (textureUpscaleEnabled != textureUpscaleWasEnabled))
Expand Down
88 changes: 44 additions & 44 deletions shell/libretro/libretro_core_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
{
CORE_OPTION_NAME "_allow_service_buttons",
"Allow NAOMI Service Buttons",
"Allow Arcade Service Buttons",
NULL,
"Enables SERVICE button for NAOMI, to enter cabinet settings.",
"Enables SERVICE button for arcade games, to enter cabinet settings.",
NULL,
"system",
{
Expand Down Expand Up @@ -263,33 +263,33 @@ struct retro_core_option_v2_definition option_defs_us[] = {
NULL,
"video",
{
{ "320x240", NULL },
{ "640x480", NULL },
{ "800x600", NULL },
{ "960x720", NULL },
{ "1024x768", NULL },
{ "1280x960", NULL },
{ "1440x1080", NULL },
{ "1600x1200", NULL },
{ "1920x1440", NULL },
{ "2560x1920", NULL },
{ "2880x2160", NULL },
{ "3200x2400", NULL },
{ "3840x2880", NULL },
{ "4480x3360", NULL },
{ "5120x3840", NULL },
{ "5760x4320", NULL },
{ "6400x4800", NULL },
{ "7040x5280", NULL },
{ "7680x5760", NULL },
{ "8320x6240", NULL },
{ "8960x6720", NULL },
{ "9600x7200", NULL },
{ "10240x7680", NULL },
{ "10880x8160", NULL },
{ "11520x8640", NULL },
{ "12160x9120", NULL },
{ "12800x9600", NULL },
{ "320x240", "320x240 (Half)" },
{ "640x480", "640x480 (Native)" },
{ "800x600", "800x600 (x1.25)" },
{ "960x720", "960x720 (x1.5)" },
{ "1024x768", "1024x768 (x1.6)" },
{ "1280x960", "1280x960 (x2)" },
{ "1440x1080", "1440x1080 (x2.25)" },
{ "1600x1200", "1600x1200 (x2.5)" },
{ "1920x1440", "1920x1440 (x3)" },
{ "2560x1920", "2560x1920 (x4)" },
{ "2880x2160", "2880x2160 (x4.5)" },
{ "3200x2400", "3200x2400 (x5)" },
{ "3840x2880", "3840x2880 (x6)" },
{ "4480x3360", "4480x3360 (x7)" },
{ "5120x3840", "5120x3840 (x8)" },
{ "5760x4320", "5760x4320 (x9)" },
{ "6400x4800", "6400x4800 (x10)" },
{ "7040x5280", "7040x5280 (x11)" },
{ "7680x5760", "7680x5760 (x12)" },
{ "8320x6240", "8320x6240 (x13)" },
{ "8960x6720", "8960x6720 (x14)" },
{ "9600x7200", "9600x7200 (x15)" },
{ "10240x7680", "10240x7680 (x16)" },
{ "10880x8160", "10880x8160 (x17)" },
{ "11520x8640", "11520x8640 (x18)" },
{ "12160x9120", "12160x9120 (x19)" },
{ "12800x9600", "12800x9600 (x20)" },
{ NULL, NULL },
},
#ifdef LOW_RES
Expand Down Expand Up @@ -344,11 +344,11 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"horizontal",
},
{/* TODO: needs explanation */
{/* TODO: needs better explanation? */
CORE_OPTION_NAME "_alpha_sorting",
"Alpha Sorting",
NULL,
"",
"Select how the transparent polygons are sorted.",
NULL,
"video",
{
Expand Down Expand Up @@ -428,11 +428,11 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"disabled",
},
{/* TODO: needs explanation */
{
CORE_OPTION_NAME "_mipmapping",
"Mipmapping",
NULL,
"",
"When enabled textures will use smaller version of themselves when they appear farther away, it can increase performances and reduce shimmering.",
NULL,
"video",
{
Expand Down Expand Up @@ -561,11 +561,11 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"1",
},
{/* TODO: needs clarification */
{
CORE_OPTION_NAME "_texupscale_max_filtered_texture_size",
"Texture Upscaling Max. Filtered Size",
NULL,
"",
"Select a maximum size value for a texture to be upscaled, if the texture size is higher than the selected value then it will not be upscaled.",
NULL,
"video",
{
Expand Down Expand Up @@ -760,7 +760,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
CORE_OPTION_NAME "_custom_textures",
"Load Custom Textures",
NULL,
"",
"Load custom textures located in the 'system/dc/textures/<game-id>/' folder.",
NULL,
"hacks",
{
Expand All @@ -770,11 +770,11 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"disabled",
},
{/* TODO: probably needs explanation */
{
CORE_OPTION_NAME "_dump_textures",
"Dump Textures",
NULL,
"",
"Every time a new texture is used by the game, it will be saved as a .png file in the 'system/dc/texdump/<game-id>/' folder.",
NULL,
"hacks",
{
Expand All @@ -788,7 +788,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
CORE_OPTION_NAME "_analog_stick_deadzone",
"Analog Stick Deadzone",
NULL,
"",
"Select how far you have to push the analog stick before it starts being processed.",
NULL,
"input",
{
Expand All @@ -807,7 +807,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
CORE_OPTION_NAME "_trigger_deadzone",
"Trigger Deadzone",
NULL,
"",
"Select how much you have to press the trigger before it starts being processed.",
NULL,
"input",
{
Expand All @@ -826,7 +826,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
CORE_OPTION_NAME "_digital_triggers",
"Digital Triggers",
NULL,
"",
"When enabled the triggers will act as regular buttons, meaning they will be processed as either fully pressed or not pressed at all, with no in-between.",
NULL,
"input",
{
Expand Down Expand Up @@ -1205,7 +1205,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
{ "Lower Right", NULL },
{ NULL, NULL },
},
"Upper Left",
"Upper Right",
},
{
CORE_OPTION_NAME "_vmu2_screen_size_mult",
Expand Down Expand Up @@ -1356,7 +1356,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
{ "Lower Right", NULL },
{ NULL, NULL },
},
"Upper Left",
"Lower Left",
},
{
CORE_OPTION_NAME "_vmu3_screen_size_mult",
Expand Down Expand Up @@ -1507,7 +1507,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
{ "Lower Right", NULL },
{ NULL, NULL },
},
"Upper Left",
"Lower Right",
},
{
CORE_OPTION_NAME "_vmu4_screen_size_mult",
Expand Down