Skip to content

Commit e057477

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the context scaling setting to a single-source def file
First level-variant row through the grammar: the label token owns the sublabel and canonical name while the RGA scaling display string stays with its value token. Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage.
1 parent b293d3b commit e057477

8 files changed

Lines changed: 477 additions & 14 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,6 @@ static struct config_bool_setting *populate_settings_bool(
18801880

18811881

18821882
SETTING_BOOL("video_allow_rotate", &settings->bools.video_allow_rotate, true, DEFAULT_ALLOW_ROTATE, false);
1883-
SETTING_BOOL("video_ctx_scaling", &settings->bools.video_ctx_scaling, true, DEFAULT_VIDEO_CTX_SCALING, false);
18841883
SETTING_BOOL("video_force_aspect", &settings->bools.video_force_aspect, true, DEFAULT_FORCE_ASPECT, false);
18851884
SETTING_BOOL("video_threaded", video_driver_get_threaded(), true, DEFAULT_VIDEO_THREADED, false);
18861885
SETTING_BOOL("video_shared_context", &settings->bools.video_shared_context, true, DEFAULT_VIDEO_SHARED_CONTEXT, false);
@@ -1932,6 +1931,7 @@ static struct config_bool_setting *populate_settings_bool(
19321931
#include "settings/settings_def_video_fullscreen.h"
19331932
#define SETTINGS_DEF_CONFIG_PASS
19341933
#include "settings/settings_def_video_sync.h"
1934+
#include "settings/settings_def_video_ctx_scaling.h"
19351935
#include "settings/settings_def_input_sensors_extra.h"
19361936
#ifdef HAVE_NETWORKING
19371937
#include "settings/settings_def_netplay_advanced.h"
@@ -2609,6 +2609,7 @@ static struct config_float_setting *populate_settings_float(
26092609
#include "settings/settings_def_video_fullscreen.h"
26102610
#define SETTINGS_DEF_CONFIG_PASS
26112611
#include "settings/settings_def_video_sync.h"
2612+
#include "settings/settings_def_video_ctx_scaling.h"
26122613
#include "settings/settings_def_input_sensors_extra.h"
26132614
#ifdef HAVE_NETWORKING
26142615
#include "settings/settings_def_netplay_advanced.h"
@@ -3244,6 +3245,7 @@ static struct config_uint_setting *populate_settings_uint(
32443245
#include "settings/settings_def_video_fullscreen.h"
32453246
#define SETTINGS_DEF_CONFIG_PASS
32463247
#include "settings/settings_def_video_sync.h"
3248+
#include "settings/settings_def_video_ctx_scaling.h"
32473249
#include "settings/settings_def_input_sensors_extra.h"
32483250
#ifdef HAVE_NETWORKING
32493251
#include "settings/settings_def_netplay_advanced.h"
@@ -3912,6 +3914,7 @@ static struct config_int_setting *populate_settings_int(
39123914
#include "settings/settings_def_video_fullscreen.h"
39133915
#define SETTINGS_DEF_CONFIG_PASS
39143916
#include "settings/settings_def_video_sync.h"
3917+
#include "settings/settings_def_video_ctx_scaling.h"
39153918
#include "settings/settings_def_input_sensors_extra.h"
39163919
#ifdef HAVE_NETWORKING
39173920
#include "settings/settings_def_netplay_advanced.h"
@@ -4468,6 +4471,7 @@ static struct config_int_setting *populate_settings_int(
44684471
#include "settings/settings_def_video_fullscreen.h"
44694472
#define SETTINGS_DEF_CONFIG_PASS
44704473
#include "settings/settings_def_video_sync.h"
4474+
#include "settings/settings_def_video_ctx_scaling.h"
44714475
#include "settings/settings_def_input_sensors_extra.h"
44724476
#ifdef HAVE_NETWORKING
44734477
#include "settings/settings_def_netplay_advanced.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2855,10 +2855,6 @@ MSG_HASH(
28552855
MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT,
28562856
MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT_STR
28572857
)
2858-
MSG_HASH(
2859-
MENU_ENUM_LABEL_VIDEO_CTX_SCALING,
2860-
MENU_ENUM_LABEL_VIDEO_CTX_SCALING_STR
2861-
)
28622858
MSG_HASH(
28632859
MENU_ENUM_LABEL_VIDEO_SOFT_FILTER,
28642860
MENU_ENUM_LABEL_VIDEO_SOFT_FILTER_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
567567
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
568568
#include "../settings/settings_def_video_fullscreen.h"
569569
#include "../settings/settings_def_video_sync.h"
570+
#include "../settings/settings_def_video_ctx_scaling.h"
570571
#include "../settings/settings_def_input_sensors_extra.h"
571572
#include "../settings/settings_def_netplay_advanced.h"
572573
#include "../settings/settings_def_menu_main_state.h"
@@ -912,6 +913,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
912913
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
913914
#include "../settings/settings_def_video_fullscreen.h"
914915
#include "../settings/settings_def_video_sync.h"
916+
#include "../settings/settings_def_video_ctx_scaling.h"
915917
#include "../settings/settings_def_input_sensors_extra.h"
916918
#include "../settings/settings_def_netplay_advanced.h"
917919
#include "../settings/settings_def_menu_main_state.h"

‎intl/msg_hash_us.h‎

Lines changed: 167 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33047,10 +33047,173 @@ MSG_HASH(
3304733047
MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
3304833048
"Context Specific Scaling"
3304933049
)
33050-
MSG_HASH(
33051-
MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING,
33052-
"Hardware context scaling (if available)."
33053-
)
33050+
/* GENERATED REGION: context scaling setting (see settings_def_video_ctx_scaling.h). */
33051+
#define SETTINGS_DEF_STRINGS_PASS
33052+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
33053+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33054+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33055+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
33056+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33057+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
33058+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33059+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33060+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
33061+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33062+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
33063+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33064+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33065+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
33066+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33067+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
33068+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33069+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33070+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
33071+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33072+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33073+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33074+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33075+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
33076+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33077+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
33078+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33079+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33080+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
33081+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33082+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33083+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33084+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33085+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
33086+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33087+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
33088+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33089+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33090+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
33091+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33092+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
33093+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33094+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33095+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
33096+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33097+
#define S_ACTION(T, n, us, sub) \
33098+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33099+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33100+
#define S_ACTION_NS(T, n, us) \
33101+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33102+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33103+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33104+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33105+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
33106+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33107+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33108+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33109+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33110+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
33111+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33112+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33113+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33114+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33115+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
33116+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33117+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33118+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33119+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33120+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
33121+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33122+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
33123+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
33124+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33125+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
33126+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
33127+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
33128+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33129+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
33130+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
33131+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33132+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
33133+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
33134+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33135+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
33136+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
33137+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
33138+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
33139+
#include "../settings/settings_def_video_ctx_scaling.h"
33140+
#undef S_BOOL
33141+
#undef S_BOOL_NS
33142+
#undef S_BOOL_H
33143+
#undef S_BOOL_NS_H
33144+
#undef S_UINT
33145+
#undef S_UINT_NS
33146+
#undef S_UINT_H
33147+
#undef S_UINT_NS_H
33148+
#undef S_INT
33149+
#undef S_INT_NS
33150+
#undef S_INT_H
33151+
#undef S_INT_NS_H
33152+
#undef S_FLOAT
33153+
#undef S_FLOAT_NS
33154+
#undef S_FLOAT_H
33155+
#undef S_FLOAT_NS_H
33156+
#undef S_STRING
33157+
#undef S_STRING_NS
33158+
#undef S_STRING_H
33159+
#undef S_STRING_NS_H
33160+
#undef S_DIR
33161+
#undef S_DIR_NS
33162+
#undef S_DIR_H
33163+
#undef S_DIR_NS_H
33164+
#undef S_STRING_P
33165+
#undef S_STRING_P_NS
33166+
#undef S_STRING_P_H
33167+
#undef S_STRING_P_NS_H
33168+
#undef S_PATH
33169+
#undef S_PATH_NS
33170+
#undef S_PATH_H
33171+
#undef S_PATH_NS_H
33172+
#undef S_PATH_DS
33173+
#undef S_PATH_DS_NS
33174+
#undef S_PATH_DS_H
33175+
#undef S_PATH_DS_NS_H
33176+
#undef S_ACTION
33177+
#undef S_ACTION_NS
33178+
#undef S_ACTION_H
33179+
#undef S_ACTION_NS_H
33180+
#undef S_BOOL_EX
33181+
#undef S_BOOL_EX_NS
33182+
#undef S_BOOL_EX_H
33183+
#undef S_BOOL_EX_NS_H
33184+
#undef S_UINT_EX
33185+
#undef S_UINT_EX_NS
33186+
#undef S_UINT_EX_H
33187+
#undef S_UINT_EX_NS_H
33188+
#undef S_INT_EX
33189+
#undef S_INT_EX_NS
33190+
#undef S_INT_EX_H
33191+
#undef S_INT_EX_NS_H
33192+
#undef S_FLOAT_EX
33193+
#undef S_FLOAT_EX_NS
33194+
#undef S_FLOAT_EX_H
33195+
#undef S_FLOAT_EX_NS_H
33196+
#undef S_ACTION_EX
33197+
#undef S_ACTION_EX_NS
33198+
#undef S_ACTION_EX_H
33199+
#undef S_ACTION_EX_NS_H
33200+
#undef S_BOOL_LV
33201+
#undef S_BOOL_LV_NS
33202+
#undef S_BOOL_LV_H
33203+
#undef S_BOOL_LV_NS_H
33204+
#undef S_FLOAT_LV
33205+
#undef S_FLOAT_LV_NS
33206+
#undef S_FLOAT_LV_H
33207+
#undef S_FLOAT_LV_NS_H
33208+
#undef S_STRING_LV
33209+
#undef S_STRING_LV_NS
33210+
#undef S_STRING_LV_H
33211+
#undef S_STRING_LV_NS_H
33212+
#undef S_ACTION_LV
33213+
#undef S_ACTION_LV_NS
33214+
#undef S_ACTION_LV_H
33215+
#undef S_ACTION_LV_NS_H
33216+
#undef SETTINGS_DEF_STRINGS_PASS
3305433217
#endif
3305533218
#ifdef _3DS
3305633219
MSG_HASH(

0 commit comments

Comments
 (0)