Skip to content

Vulkan: dedupe r_imgui init; fix cs_autoInit compat grep #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cursor wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Vulkan: dedupe r_imgui init; fix cs_autoInit compat grep #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9387ca3
Vulkan: consolidate r_imgui cvar init under USE_IMGUI
cursoragent May 25, 2026
87bddbc
scripts: accept Cvar_Get in cs_autoInit compat check
cursoragent May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/q3_openarena_compat_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ else
fail "r_vdbFog default not 0"
fi

if grep -qE 'cs_autoInit[[:space:]]*=[[:space:]]*ri\.Cvar_Get\([[:space:]]*"cs_autoInit"[[:space:]]*,[[:space:]]*"0"' \
if grep -qE 'cs_autoInit[[:space:]]*=[[:space:]]*(ri\.)?Cvar_Get\([[:space:]]*"cs_autoInit"[[:space:]]*,[[:space:]]*"0"' \
"$PROJECT_ROOT/src/qcommon/csharp_debug.c"; then
pass "cs_autoInit defaults to 0 (C# runtime manual until cs_reload)"
else
Expand Down
18 changes: 3 additions & 15 deletions src/renderers/vulkan/tr_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ cvar_t *r_firstPersonScaleEnabled;
cvar_t *r_firstPersonZNear;

cvar_t *r_skipBackEnd;
#ifdef USE_IMGUI
cvar_t *r_imgui;
#endif

//cvar_t *r_anaglyphMode;

Expand Down Expand Up @@ -2600,16 +2597,6 @@ static void R_Register( void )
//
r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
ri.Cvar_SetDescription( r_showImages, "Draw all images currently loaded into memory:\n 0: Disabled\n 1: Show images set to uniform size\n 2: Show images with scaled relative to largest image" );
#ifdef USE_IMGUI
r_imgui = ri.Cvar_Get( "r_imgui", "1", CVAR_ARCHIVE_ND );
ri.Cvar_CheckRange( r_imgui, "0", "1", CV_INTEGER );
ri.Cvar_SetDescription( r_imgui,
"Draw Dear ImGui debug inspector overlay (Vulkan): dockspace, PostFX/physics/volumetrics panels. "
"Requires USE_IMGUI build. Set 0 during gameplay if mouse capture conflicts with look." );
if ( r_imgui && r_imgui->integer ) {
ri.Printf( PRINT_ALL, "ImGui inspector overlay: r_imgui 1 (toggle with r_imgui 0)\n" );
}
#endif

r_debugLight = ri.Cvar_Get( "r_debuglight", "0", CVAR_TEMP );
ri.Cvar_SetDescription( r_debugLight, "Debugging tool to print ambient and directed lighting information." );
Expand Down Expand Up @@ -2690,9 +2677,10 @@ static void R_Register( void )

#ifdef USE_IMGUI
r_imgui = ri.Cvar_Get( "r_imgui", "1", CVAR_ARCHIVE_ND );
ri.Cvar_SetDescription( r_imgui,
"Vulkan ImGui debug inspector overlay (0=off, 1=on). Toggle at runtime with F11 when enabled." );
ri.Cvar_CheckRange( r_imgui, "0", "1", CV_INTEGER );
ri.Cvar_SetDescription( r_imgui,
"Dear ImGui debug inspector (Vulkan, USE_IMGUI): dockspace with PostFX/physics/volumetrics panels. "
"Set 0 during gameplay if mouse capture conflicts with look. F11 toggles when enabled." );
ri.Printf( PRINT_ALL, "[VK][imgui] debug inspector r_imgui=%d (F11 toggles when enabled)\n",
r_imgui->integer );
r_studio_tools = ri.Cvar_Get( "r_studio_tools", "0", CVAR_ARCHIVE_ND );
Expand Down
3 changes: 0 additions & 3 deletions src/renderers/vulkan/tr_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,9 +1768,6 @@ extern cvar_t *r_portalOnly;
extern cvar_t *r_subdivisions;
extern cvar_t *r_lodCurveError;
extern cvar_t *r_skipBackEnd;
#ifdef USE_IMGUI
extern cvar_t *r_imgui;
#endif

extern cvar_t *r_greyscale;
extern cvar_t *r_dither;
Expand Down
Loading