Vulkan: remove stale compile-time feature flags and dead branches - #296
Draft
cursor[bot] wants to merge 4 commits into
Draft
Vulkan: remove stale compile-time feature flags and dead branches#296cursor[bot] wants to merge 4 commits into
cursor[bot] wants to merge 4 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>
Remove dead OpenGL and non-PBR preprocessor branches guarded by macros that are permanently defined in renderers/vulkan/tr_local.h and tr_common.h. Adds scripts/tools/unwrap_compile_flags.py with safer nested #if depth tracking. Fixes VK_CUBEMAP nesting and orphaned endif left by partial unwrap in tr_init.c, tr_shade.c, vk_object_id.c, and contract headers. Co-authored-by: Tim Fox <timfox@outlook.com>
- Restore vk_vbo.c from main and delete USE_VBO_GRID/TESS blocks (not unwrap). - Unwrap USE_VK_PBR/USE_VBO with depth-safe endif matching. - Fix extern C guards in shadow/frame/reflection contract headers. - Repair tr_init.c VK_CUBEMAP nesting and remove orphan USE_VULKAN endif. - Remove stray preprocessor lines in tr_shade.c and vk_object_id.c. - Harden unwrap_compile_flags.py endif regex (no .*$ swallowing). 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
Removes stale compile-time feature flags and dead preprocessor branches in the Vulkan renderer where rollout is complete. The active PBR/VBO/Vulkan paths are unchanged; OpenGL fallbacks and never-defined grid/tess paths are deleted.
Flags removed
USE_VBO_GRIDtr_local.h; SF_GRID stays off the static VBO path by designUSE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2USE_VK_PBR(compile-time#else)#define USE_VK_PBRintr_local.h; runtimevk.pbrActivegating keptUSE_VBO/USE_VULKAN/USE_FOG_COLLAPSE(file guards)renderers/vulkan; OpenGL / non-VBO fallbacks removedUSE_DEDICATED_ALLOCATIONoverride#define USE_DEDICATED_ALLOCATIONinvk.hTooling
scripts/tools/unwrap_use_vk_pbr.py— unwrapUSE_VK_PBR#elsebranchesscripts/tools/unwrap_compile_flags.py— unwrap always-on Vulkan macros with nested#ifdepth trackingBehavioral parity checks
idtech3_vulkan_x86builds successfully (make idtech3_vulkan_x86inbuild-vk-ReleasewithIDTECH3_PROFILE=core)renderers/vulkanC/H sources (no orphan#if/#endif)vk_vbo.cR_BuildWorldVBOafter verifying cherry-picked grid removal did not truncate the functionextern "C"header guards so C compilation exposes contract APIsTest plan
./scripts/bootstrap.sh engine./scripts/smoke_test.sh ./build-vk-Release(or relevant subset)docs/ENGINE_MODULE_MANIFEST.md)./scripts/ci/audit_unconditional_sources.sh(when touching CMake source lists)