Skip to content

Commit ae776c7

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the Direct3D 11 GPU index setting to a single-source def file
The GPU index label lives with the Vulkan def; this driver's row references it and keeps its own field and configuration key. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 815d5e1 commit ae776c7

5 files changed

Lines changed: 377 additions & 6 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,6 +1934,7 @@ static struct config_bool_setting *populate_settings_bool(
19341934
#include "settings/settings_def_video_fullscreen.h"
19351935
#define SETTINGS_DEF_CONFIG_PASS
19361936
#include "settings/settings_def_video_sync.h"
1937+
#include "settings/settings_def_gpu_index_d3d11.h"
19371938
#include "settings/settings_def_aspect_ratio.h"
19381939
#include "settings/settings_def_viewport_size.h"
19391940
#include "settings/settings_def_quit_visibility.h"
@@ -2635,6 +2636,7 @@ static struct config_float_setting *populate_settings_float(
26352636
#include "settings/settings_def_video_fullscreen.h"
26362637
#define SETTINGS_DEF_CONFIG_PASS
26372638
#include "settings/settings_def_video_sync.h"
2639+
#include "settings/settings_def_gpu_index_d3d11.h"
26382640
#include "settings/settings_def_aspect_ratio.h"
26392641
#include "settings/settings_def_viewport_size.h"
26402642
#include "settings/settings_def_quit_visibility.h"
@@ -3291,6 +3293,7 @@ static struct config_uint_setting *populate_settings_uint(
32913293
#include "settings/settings_def_video_fullscreen.h"
32923294
#define SETTINGS_DEF_CONFIG_PASS
32933295
#include "settings/settings_def_video_sync.h"
3296+
#include "settings/settings_def_gpu_index_d3d11.h"
32943297
#include "settings/settings_def_aspect_ratio.h"
32953298
#include "settings/settings_def_viewport_size.h"
32963299
#include "settings/settings_def_quit_visibility.h"
@@ -3983,6 +3986,7 @@ static struct config_int_setting *populate_settings_int(
39833986
#include "settings/settings_def_video_fullscreen.h"
39843987
#define SETTINGS_DEF_CONFIG_PASS
39853988
#include "settings/settings_def_video_sync.h"
3989+
#include "settings/settings_def_gpu_index_d3d11.h"
39863990
#include "settings/settings_def_aspect_ratio.h"
39873991
#include "settings/settings_def_viewport_size.h"
39883992
#include "settings/settings_def_quit_visibility.h"
@@ -4563,6 +4567,7 @@ static struct config_int_setting *populate_settings_int(
45634567
#include "settings/settings_def_video_fullscreen.h"
45644568
#define SETTINGS_DEF_CONFIG_PASS
45654569
#include "settings/settings_def_video_sync.h"
4570+
#include "settings/settings_def_gpu_index_d3d11.h"
45664571
#include "settings/settings_def_aspect_ratio.h"
45674572
#include "settings/settings_def_viewport_size.h"
45684573
#include "settings/settings_def_quit_visibility.h"

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
571571
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
572572
#include "../settings/settings_def_video_fullscreen.h"
573573
#include "../settings/settings_def_video_sync.h"
574+
#include "../settings/settings_def_gpu_index_d3d11.h"
574575
#include "../settings/settings_def_aspect_ratio.h"
575576
#include "../settings/settings_def_viewport_size.h"
576577
#include "../settings/settings_def_quit_visibility.h"
@@ -938,6 +939,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
938939
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
939940
#include "../settings/settings_def_video_fullscreen.h"
940941
#include "../settings/settings_def_video_sync.h"
942+
#include "../settings/settings_def_gpu_index_d3d11.h"
941943
#include "../settings/settings_def_aspect_ratio.h"
942944
#include "../settings/settings_def_viewport_size.h"
943945
#include "../settings/settings_def_quit_visibility.h"

‎intl/msg_hash_us.h‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36605,3 +36605,188 @@ MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3660536605
#undef S_UINT_AT_EX_H
3660636606
#undef S_UINT_AT_EX_NS_H
3660736607
#undef SETTINGS_DEF_STRINGS_PASS
36608+
/* GENERATED REGION: Direct3D 11 GPU index setting (see settings_def_gpu_index_d3d11.h). */
36609+
#define SETTINGS_DEF_STRINGS_PASS
36610+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
36611+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36612+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36613+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
36614+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36615+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36616+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36617+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36618+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36619+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36620+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36621+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36622+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36623+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36624+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36625+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
36626+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36627+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36628+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
36629+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36630+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36631+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36632+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36633+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
36634+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36635+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
36636+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36637+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36638+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
36639+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36640+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36641+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36642+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36643+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
36644+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36645+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
36646+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36647+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36648+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
36649+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36650+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
36651+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36652+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36653+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
36654+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36655+
#define S_ACTION(T, n, us, sub) \
36656+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36657+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36658+
#define S_ACTION_NS(T, n, us) \
36659+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36660+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36661+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36662+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36663+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
36664+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36665+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36666+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36667+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36668+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
36669+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36670+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36671+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36672+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36673+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
36674+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36675+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36676+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36677+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36678+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
36679+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36680+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
36681+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36682+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36683+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
36684+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36685+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
36686+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36687+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
36688+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
36689+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36690+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
36691+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36692+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36693+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
36694+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
36695+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36696+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
36697+
#define S_INT_AT(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36698+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36699+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36700+
#define S_INT_AT_NS(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36701+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36702+
#define S_UINT_AT_EX(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36703+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36704+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36705+
#define S_UINT_AT_EX_NS(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
36706+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36707+
#include "../settings/settings_def_gpu_index_d3d11.h"
36708+
#undef S_BOOL
36709+
#undef S_BOOL_NS
36710+
#undef S_BOOL_H
36711+
#undef S_BOOL_NS_H
36712+
#undef S_UINT
36713+
#undef S_UINT_NS
36714+
#undef S_UINT_H
36715+
#undef S_UINT_NS_H
36716+
#undef S_INT
36717+
#undef S_INT_NS
36718+
#undef S_INT_H
36719+
#undef S_INT_NS_H
36720+
#undef S_FLOAT
36721+
#undef S_FLOAT_NS
36722+
#undef S_FLOAT_H
36723+
#undef S_FLOAT_NS_H
36724+
#undef S_STRING
36725+
#undef S_STRING_NS
36726+
#undef S_STRING_H
36727+
#undef S_STRING_NS_H
36728+
#undef S_DIR
36729+
#undef S_DIR_NS
36730+
#undef S_DIR_H
36731+
#undef S_DIR_NS_H
36732+
#undef S_STRING_P
36733+
#undef S_STRING_P_NS
36734+
#undef S_STRING_P_H
36735+
#undef S_STRING_P_NS_H
36736+
#undef S_PATH
36737+
#undef S_PATH_NS
36738+
#undef S_PATH_H
36739+
#undef S_PATH_NS_H
36740+
#undef S_PATH_DS
36741+
#undef S_PATH_DS_NS
36742+
#undef S_PATH_DS_H
36743+
#undef S_PATH_DS_NS_H
36744+
#undef S_ACTION
36745+
#undef S_ACTION_NS
36746+
#undef S_ACTION_H
36747+
#undef S_ACTION_NS_H
36748+
#undef S_BOOL_EX
36749+
#undef S_BOOL_EX_NS
36750+
#undef S_BOOL_EX_H
36751+
#undef S_BOOL_EX_NS_H
36752+
#undef S_UINT_EX
36753+
#undef S_UINT_EX_NS
36754+
#undef S_UINT_EX_H
36755+
#undef S_UINT_EX_NS_H
36756+
#undef S_INT_EX
36757+
#undef S_INT_EX_NS
36758+
#undef S_INT_EX_H
36759+
#undef S_INT_EX_NS_H
36760+
#undef S_FLOAT_EX
36761+
#undef S_FLOAT_EX_NS
36762+
#undef S_FLOAT_EX_H
36763+
#undef S_FLOAT_EX_NS_H
36764+
#undef S_ACTION_EX
36765+
#undef S_ACTION_EX_NS
36766+
#undef S_ACTION_EX_H
36767+
#undef S_ACTION_EX_NS_H
36768+
#undef S_BOOL_LV
36769+
#undef S_BOOL_LV_NS
36770+
#undef S_BOOL_LV_H
36771+
#undef S_BOOL_LV_NS_H
36772+
#undef S_FLOAT_LV
36773+
#undef S_FLOAT_LV_NS
36774+
#undef S_FLOAT_LV_H
36775+
#undef S_FLOAT_LV_NS_H
36776+
#undef S_STRING_LV
36777+
#undef S_STRING_LV_NS
36778+
#undef S_STRING_LV_H
36779+
#undef S_STRING_LV_NS_H
36780+
#undef S_ACTION_LV
36781+
#undef S_ACTION_LV_NS
36782+
#undef S_ACTION_LV_H
36783+
#undef S_ACTION_LV_NS_H
36784+
#undef S_INT_AT
36785+
#undef S_INT_AT_NS
36786+
#undef S_INT_AT_H
36787+
#undef S_INT_AT_NS_H
36788+
#undef S_UINT_AT_EX
36789+
#undef S_UINT_AT_EX_NS
36790+
#undef S_UINT_AT_EX_H
36791+
#undef S_UINT_AT_EX_NS_H
36792+
#undef SETTINGS_DEF_STRINGS_PASS

0 commit comments

Comments
 (0)