Remove stale Vulkan compile-time feature flags (USE_VBO_GRID, USE_TESS_NEEDS, USE_VK_PBR #else)#277
Draft
cursor[bot] wants to merge 2 commits into
Draft
Remove stale Vulkan compile-time feature flags (USE_VBO_GRID, USE_TESS_NEEDS, USE_VK_PBR #else)#277cursor[bot] wants to merge 2 commits into
cursor[bot] wants to merge 2 commits into
Conversation
…_VBO_GRID, USE_TESS_NEEDS) - Delete dead non-PBR shader init and teardown paths (USE_VK_PBR always on) - Unwrap USE_VBO_GRID grid-VBO paths; drop orphaned macro - Remove disabled USE_TESS_NEEDS_NORMAL/ST2 guards and tess plumbing - Pin VERTEXSIZE to 11 (PBR vertex layout) Co-authored-by: Tim Fox <timfox@outlook.com>
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
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 in
renderers/vulkan/that are permanently enabled and whose disabled branches are dead code. Preserves runtime toggles (vk.pbrActive,r_pbr, etc.).Flags removed
USE_VBOis on (always). Grid VBO path is the only implementation;#ifdefguards were no-ops.tr_local.h; guards always evaluated false, so tessneedsNormal/needsST2plumbing was dead.#elseUSE_VK_PBRis unconditionally defined; PBR vertex layout (11 floats) is the only path.#elseinvk_shader_modules.c/vk_shutdown.cVK_PBR_BRDFLUT/VK_CUBEMAPdefines intr_local.h.vk_pbr_ibl_validate.cvk.pbrActivecheck retained.Files touched
renderers/vulkan/tr_local.h,tr_surface.c,tr_shade.c,tr_main.c,tr_animation.crenderers/vulkan/vk_shader_modules.c,vk_shutdown.c,vk_vbo.crenderers/vulkan/vk_pbr_ibl_validate.cBehavioral parity
vk.pbrActive.r_pbr,r_forwardPlus, etc.) untouched.Candidates not removed (low confidence)
#ifdef USE_VK_PBRunwrapping acrossvk_*.c/tr_*.c(large diff, struct members still gated)r_allowSoftwareGL/r_glDriver(kept for mod cfg compatibility)USE_VULKAN_RTX,USE_EXPERIMENTAL_RENDERERS, etc.)Test plan
./tests/scripts/test_vulkan_regression_source_guards.sh— PASS./scripts/compile_engine.sh vulkan core— PASS./scripts/smoke_test.sh ./build-vk-Release(headless VM: server/binary checks only)./scripts/ci/audit_unconditional_sources.sh— N/A