Skip to content

Commit 9b14b61

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the Direct3D 12 GPU index setting to a single-source def file
Second reference-terminal GPU index row through the reference machinery. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent ae776c7 commit 9b14b61

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_d3d12.h"
19371938
#include "settings/settings_def_gpu_index_d3d11.h"
19381939
#include "settings/settings_def_aspect_ratio.h"
19391940
#include "settings/settings_def_viewport_size.h"
@@ -2636,6 +2637,7 @@ static struct config_float_setting *populate_settings_float(
26362637
#include "settings/settings_def_video_fullscreen.h"
26372638
#define SETTINGS_DEF_CONFIG_PASS
26382639
#include "settings/settings_def_video_sync.h"
2640+
#include "settings/settings_def_gpu_index_d3d12.h"
26392641
#include "settings/settings_def_gpu_index_d3d11.h"
26402642
#include "settings/settings_def_aspect_ratio.h"
26412643
#include "settings/settings_def_viewport_size.h"
@@ -3293,6 +3295,7 @@ static struct config_uint_setting *populate_settings_uint(
32933295
#include "settings/settings_def_video_fullscreen.h"
32943296
#define SETTINGS_DEF_CONFIG_PASS
32953297
#include "settings/settings_def_video_sync.h"
3298+
#include "settings/settings_def_gpu_index_d3d12.h"
32963299
#include "settings/settings_def_gpu_index_d3d11.h"
32973300
#include "settings/settings_def_aspect_ratio.h"
32983301
#include "settings/settings_def_viewport_size.h"
@@ -3986,6 +3989,7 @@ static struct config_int_setting *populate_settings_int(
39863989
#include "settings/settings_def_video_fullscreen.h"
39873990
#define SETTINGS_DEF_CONFIG_PASS
39883991
#include "settings/settings_def_video_sync.h"
3992+
#include "settings/settings_def_gpu_index_d3d12.h"
39893993
#include "settings/settings_def_gpu_index_d3d11.h"
39903994
#include "settings/settings_def_aspect_ratio.h"
39913995
#include "settings/settings_def_viewport_size.h"
@@ -4567,6 +4571,7 @@ static struct config_int_setting *populate_settings_int(
45674571
#include "settings/settings_def_video_fullscreen.h"
45684572
#define SETTINGS_DEF_CONFIG_PASS
45694573
#include "settings/settings_def_video_sync.h"
4574+
#include "settings/settings_def_gpu_index_d3d12.h"
45704575
#include "settings/settings_def_gpu_index_d3d11.h"
45714576
#include "settings/settings_def_aspect_ratio.h"
45724577
#include "settings/settings_def_viewport_size.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_d3d12.h"
574575
#include "../settings/settings_def_gpu_index_d3d11.h"
575576
#include "../settings/settings_def_aspect_ratio.h"
576577
#include "../settings/settings_def_viewport_size.h"
@@ -939,6 +940,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
939940
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
940941
#include "../settings/settings_def_video_fullscreen.h"
941942
#include "../settings/settings_def_video_sync.h"
943+
#include "../settings/settings_def_gpu_index_d3d12.h"
942944
#include "../settings/settings_def_gpu_index_d3d11.h"
943945
#include "../settings/settings_def_aspect_ratio.h"
944946
#include "../settings/settings_def_viewport_size.h"

‎intl/msg_hash_us.h‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36790,3 +36790,188 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3679036790
#undef S_UINT_AT_EX_H
3679136791
#undef S_UINT_AT_EX_NS_H
3679236792
#undef SETTINGS_DEF_STRINGS_PASS
36793+
/* GENERATED REGION: Direct3D 12 GPU index setting (see settings_def_gpu_index_d3d12.h). */
36794+
#define SETTINGS_DEF_STRINGS_PASS
36795+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
36796+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36797+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36798+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
36799+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36800+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36801+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36802+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36803+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36804+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36805+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36806+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36807+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36808+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36809+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36810+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
36811+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36812+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36813+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
36814+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36815+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36816+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36817+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36818+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
36819+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36820+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
36821+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36822+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36823+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
36824+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36825+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36826+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36827+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36828+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
36829+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36830+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
36831+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36832+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36833+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
36834+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36835+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
36836+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36837+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36838+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
36839+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36840+
#define S_ACTION(T, n, us, sub) \
36841+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36842+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36843+
#define S_ACTION_NS(T, n, us) \
36844+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36845+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36846+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36847+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36848+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
36849+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36850+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36851+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36852+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36853+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
36854+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36855+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36856+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36857+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36858+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
36859+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36860+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36861+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36862+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36863+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
36864+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36865+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
36866+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36867+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36868+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
36869+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36870+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
36871+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36872+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
36873+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
36874+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36875+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
36876+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
36877+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36878+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
36879+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
36880+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36881+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
36882+
#define S_INT_AT(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
36883+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36884+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36885+
#define S_INT_AT_NS(offs, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
36886+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36887+
#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) \
36888+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
36889+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
36890+
#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) \
36891+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
36892+
#include "../settings/settings_def_gpu_index_d3d12.h"
36893+
#undef S_BOOL
36894+
#undef S_BOOL_NS
36895+
#undef S_BOOL_H
36896+
#undef S_BOOL_NS_H
36897+
#undef S_UINT
36898+
#undef S_UINT_NS
36899+
#undef S_UINT_H
36900+
#undef S_UINT_NS_H
36901+
#undef S_INT
36902+
#undef S_INT_NS
36903+
#undef S_INT_H
36904+
#undef S_INT_NS_H
36905+
#undef S_FLOAT
36906+
#undef S_FLOAT_NS
36907+
#undef S_FLOAT_H
36908+
#undef S_FLOAT_NS_H
36909+
#undef S_STRING
36910+
#undef S_STRING_NS
36911+
#undef S_STRING_H
36912+
#undef S_STRING_NS_H
36913+
#undef S_DIR
36914+
#undef S_DIR_NS
36915+
#undef S_DIR_H
36916+
#undef S_DIR_NS_H
36917+
#undef S_STRING_P
36918+
#undef S_STRING_P_NS
36919+
#undef S_STRING_P_H
36920+
#undef S_STRING_P_NS_H
36921+
#undef S_PATH
36922+
#undef S_PATH_NS
36923+
#undef S_PATH_H
36924+
#undef S_PATH_NS_H
36925+
#undef S_PATH_DS
36926+
#undef S_PATH_DS_NS
36927+
#undef S_PATH_DS_H
36928+
#undef S_PATH_DS_NS_H
36929+
#undef S_ACTION
36930+
#undef S_ACTION_NS
36931+
#undef S_ACTION_H
36932+
#undef S_ACTION_NS_H
36933+
#undef S_BOOL_EX
36934+
#undef S_BOOL_EX_NS
36935+
#undef S_BOOL_EX_H
36936+
#undef S_BOOL_EX_NS_H
36937+
#undef S_UINT_EX
36938+
#undef S_UINT_EX_NS
36939+
#undef S_UINT_EX_H
36940+
#undef S_UINT_EX_NS_H
36941+
#undef S_INT_EX
36942+
#undef S_INT_EX_NS
36943+
#undef S_INT_EX_H
36944+
#undef S_INT_EX_NS_H
36945+
#undef S_FLOAT_EX
36946+
#undef S_FLOAT_EX_NS
36947+
#undef S_FLOAT_EX_H
36948+
#undef S_FLOAT_EX_NS_H
36949+
#undef S_ACTION_EX
36950+
#undef S_ACTION_EX_NS
36951+
#undef S_ACTION_EX_H
36952+
#undef S_ACTION_EX_NS_H
36953+
#undef S_BOOL_LV
36954+
#undef S_BOOL_LV_NS
36955+
#undef S_BOOL_LV_H
36956+
#undef S_BOOL_LV_NS_H
36957+
#undef S_FLOAT_LV
36958+
#undef S_FLOAT_LV_NS
36959+
#undef S_FLOAT_LV_H
36960+
#undef S_FLOAT_LV_NS_H
36961+
#undef S_STRING_LV
36962+
#undef S_STRING_LV_NS
36963+
#undef S_STRING_LV_H
36964+
#undef S_STRING_LV_NS_H
36965+
#undef S_ACTION_LV
36966+
#undef S_ACTION_LV_NS
36967+
#undef S_ACTION_LV_H
36968+
#undef S_ACTION_LV_NS_H
36969+
#undef S_INT_AT
36970+
#undef S_INT_AT_NS
36971+
#undef S_INT_AT_H
36972+
#undef S_INT_AT_NS_H
36973+
#undef S_UINT_AT_EX
36974+
#undef S_UINT_AT_EX_NS
36975+
#undef S_UINT_AT_EX_H
36976+
#undef S_UINT_AT_EX_NS_H
36977+
#undef SETTINGS_DEF_STRINGS_PASS

0 commit comments

Comments
 (0)