Vulkan: remove stale compile-time feature flags and dead branches - #297
Draft
cursor[bot] wants to merge 3 commits into
Draft
Vulkan: remove stale compile-time feature flags and dead branches#297cursor[bot] wants to merge 3 commits into
cursor[bot] wants to merge 3 commits into
Conversation
- USE_VBO_GRID: never defined (SF_GRID deliberately off VBO path per tr_local.h); remove dead grid VBO estimate/queue/pack paths in vk_vbo.c and tr_surface.c. - USE_TESS_NEEDS_NORMAL / USE_TESS_NEEDS_ST2: commented-out defines with no struct fields; remove preprocessor guards that only wrapped always-on paths. - USE_VK_PBR dead #else: unwrap non-PBR shader module init/destroy fallbacks in vk_shader_modules.c and vk_shutdown.c; flatten VK_CUBEMAP/VK_PBR_BRDFLUT nesting in tr_local.h; unwrap reactive/object-id storage descriptor (void)0 else stubs. - USE_DEDICATED_ALLOCATION: always defined in vk.h; drop redundant #ifndef override in vk_instance.c. Behavior unchanged on the active PBR/VBO/dedicated-allocation paths. Co-authored-by: Tim Fox <timfox@outlook.com>
USE_VK_PBR is unconditionally defined in tr_local.h for the Vulkan renderer. Remove non-PBR #else fallbacks in pipeline creation, vertex layout, descriptor counts, and BSP/surface helpers while keeping shader templates and runtime vk.pbrActive gating intact. Adds scripts/tools/unwrap_use_vk_pbr.py for future cleanups. Co-authored-by: Tim Fox <timfox@outlook.com>
…COLLAPSE, USE_VK_PBR) Remove dead OpenGL fallback branches and one-sided preprocessor guards for flags that are permanently enabled in the Vulkan renderer. Adds scripts/tools/unwrap_compile_flags.py for repeatable cleanup. Fix stray #endif in vk_object_id.c after guard removal. Restore explicit #define USE_VULKAN in tr_common.h. 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
Reduces technical debt by removing stale compile-time feature flags and dead conditional branches in the Vulkan renderer. Behavior of the active path is preserved.
Flags removed
USE_VBO_GRIDtr_local.h)USE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2USE_VK_PBRdead#elsebranches#define USE_VK_PBRintr_local.h; legacy non-PBR shader module path removedUSE_DEDICATED_ALLOCATIONdead#ifndef#define USE_DEDICATED_ALLOCATIONinvk.hUSE_VULKANdead#ifndefbranchesUSE_VBO/USE_FOG_COLLAPSE/USE_VK_PBRone-sided#ifdefguardsTooling
scripts/tools/unwrap_use_vk_pbr.py— unwrap#ifdef USE_VK_PBR/#elseblocks (cherry-picked)scripts/tools/unwrap_compile_flags.py— generic unwrap for always-on flagsStats
~3,500 lines removed across 187 files.
Behavioral parity checks
tests/scripts/test_vulkan_regression_source_guards.sh— PASStests/scripts/test_cpp20_sources.sh— PASS#if/#endifbalance scan acrossrenderers/— cleanUSE_VBO_GRID,USE_TESS_NEEDS,#ifndef USE_VK_PBR,#ifndef USE_VULKANinrenderers/Test plan
./scripts/bootstrap.sh engine./scripts/smoke_test.sh ./build-vk-ReleaseCandidates deferred (low confidence)
#ifdef USE_VK_PBRin GLSL shader templates (gen_frag.tmpl,gen_vert.tmpl) — still used for shader variant compilationr_forwardPlus,r_rtx, etc.) — user-tunable, not compile-time flagsUSE_VULKAN_RTX,USE_EXPERIMENTAL_RENDERERS) — still meaningful build toggles