Vulkan: dedupe r_imgui init; fix cs_autoInit compat grep#223
Draft
cursor[bot] wants to merge 2 commits into
Draft
Vulkan: dedupe r_imgui init; fix cs_autoInit compat grep#223cursor[bot] wants to merge 2 commits into
cursor[bot] wants to merge 2 commits into
Conversation
Remove duplicate tentative r_imgui definition, duplicate extern in tr_local.h, and a second Cvar_Get block that overwrote descriptions and re-logged startup. Single registration preserves defaults and r_studio_tools wiring; merged cvar description documents dockspace panels and F11 toggle. Co-authored-by: Tim Fox <timfox@outlook.com>
qcommon/csharp_debug.c registers cs_autoInit via Cvar_Get, not ri.Cvar_Get; widen the grep so the OpenArena-style compat smoke passes. Co-authored-by: Tim Fox <timfox@outlook.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This branch removes stale duplicate plumbing around the ImGui debug toggles and fixes a compat smoke false negative (not a runtime behavior change).
Flags / toggles
r_imgui#ifdef USE_IMGUI(second call overwrote the first). Now a singleCvar_Get+ description + startup log. Default remains 1.r_studio_toolsr_imguideclarationscvar_t *r_imguiand duplicateexternintr_local.h(legal C merge, but confusing and error-prone).Why safe: The second registration was the effective one at runtime; consolidating to one path preserves the same defaults, archive flags, and check ranges. The merged description combines the dockspace/F11 guidance from both prior strings.
Compat script
scripts/q3_openarena_compat_check.sh:cs_autoInitcheck now allows(ri.)?Cvar_Getbecausesrc/qcommon/csharp_debug.cusesCvar_Get. Default is still 0; the script was matching the wrong API name.Behavioral parity checks
./scripts/compile_engine.sh vulkan(incremental): success —idtech3_vulkan.solinked.ctestinbuild-vk-Release(28 tests includingsmoke_test): all passed.Candidates not changed (low confidence / out of scope)
r_forwardPlus*,r_rtx*, etc. remain user-visible kill-switches or tuning knobs; no evidence they are permanently fixed on/off in tree.USE_*compile options removed.