Skip to content

Commit 1d457e1

Browse files
libretroadminLibretroAdmin
authored andcommitted
menu_setting: silence two warnings from the consolidation work
Two warnings, no behaviour change. In the video builder the adaptive-vsync row is guarded by a driver-flag test and the frame-delay row that follows is not, but the ADD_DESC conversion left the latter indented as if it were - the compiler correctly flagged the misleading indentation. The frame-delay rows are unconditional, confirmed against the displaylist dump, so the fix is purely to dedent them to their real nesting. The descriptor registry and its lookup exist only to feed the validation referee, so outside a validation build settings_master_find was defined but unused. Both the registry and the finder now sit under the same RETROARCH_VALIDATION_DUMPS guard as their only caller, which also keeps them out of release binaries entirely - they were never meant to cost release size. Dumps byte-identical, referee unchanged.
1 parent 6b5cf43 commit 1d457e1

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

menu/menu_setting.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14342,9 +14342,9 @@ static void settings_build_video(
1434214342
}
1434314343

1434414344
if (video_driver_test_all_flags(GFX_CTX_FLAGS_ADAPTIVE_VSYNC))
14345-
ADD_DESC(avsync_desc);
14345+
ADD_DESC(avsync_desc);
1434614346

14347-
ADD_DESC(fdelay_desc);
14347+
ADD_DESC(fdelay_desc);
1434814348

1434914349
/* Unlike all other shader-related menu entries
1435014350
* (which appear in the shaders quick menu, and
@@ -17639,6 +17639,7 @@ static rarch_setting_t *settings_lazy_get(unsigned k)
1763917639
}
1764017640

1764117641

17642+
#if defined(RETROARCH_VALIDATION_DUMPS)
1764217643
/* --- Stage A of the layout consolidation -------------------------
1764317644
* Every descriptor table, registered once with the guards of its
1764417645
* add_desc call site, so a setting is constructible by enum without
@@ -18162,6 +18163,7 @@ static const setting_desc_t *settings_master_find(enum msg_hash_enums e)
1816218163
}
1816318164
return NULL;
1816418165
}
18166+
#endif /* RETROARCH_VALIDATION_DUMPS */
1816518167

1816618168
static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_info)
1816718169
{

0 commit comments

Comments
 (0)