Feature-flag cleanup: remove stale Vulkan compile-time guards#293
Draft
cursor[bot] wants to merge 7 commits into
Draft
Feature-flag cleanup: remove stale Vulkan compile-time guards#293cursor[bot] wants to merge 7 commits into
cursor[bot] wants to merge 7 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>
Remove non-PBR fallback code paths that cannot compile: USE_VK_PBR is unconditionally defined in tr_local.h. Keeps PBR vertex bindings (10), descriptor set count (20), shader module tables, pipeline factory switch, and material paint vertex color offsets (VERTEXSIZE 11 layout). Co-authored-by: Tim Fox <timfox@outlook.com>
Co-authored-by: Tim Fox <timfox@outlook.com>
Unwrap the non-PBR shader file path fallback now that USE_VK_PBR is always defined for the Vulkan renderer. Co-authored-by: Tim Fox <timfox@outlook.com>
…aths Unwrap always-on Forward+ reactive-mask descriptor updates and the deferred-export use_pbr guard now that USE_VK_PBR is unconditionally defined. Co-authored-by: Tim Fox <timfox@outlook.com>
USE_VBO_GRID is no longer defined anywhere; grid VBO reset is always-on. 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
Cherry-picked and rebased the established Vulkan compile-time feature-flag cleanup onto current
main. Removes dead#elsebranches and always-on guards that no longer toggle behavior.Branch:
cursor/feature-flag-cleanup-2957→mainFlags removed
USE_VBO_GRIDUSE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2USE_VK_PBRdead#elsebranchesUSE_VK_PBRand uses generated PBR shaders.VK_CUBEMAP/VK_PBR_BRDFLUTunderUSE_VK_PBRtr_local.h(both are unconditionally#defined for codebase inspection).#else(void)0stubs and empty fallback blocks that compiled to no-ops.Preserved (not removed)
#ifdef USE_VK_PBRblocks still used for shader variant selection and specialization constants.USE_VULKAN_RTX,USE_EXPERIMENTAL_RENDERERS,USE_VK_VALIDATION) — still meaningful build-time toggles.r_forwardPlus,r_pbr, etc.) — user-facing controls, not compile-time rollout flags.Stats
USE_VBO_GRID,USE_TESS_NEEDS_*, or#ifndef USE_VK_PBRinrenderers/Test plan
./tests/scripts/test_vulkan_regression_source_guards.sh— PASSrenderers/vk_create_pipeline.cresolved (kept updated 45-entry PBR specialization map frommain)./scripts/bootstrap.sh engine(CI)./scripts/smoke_test.sh ./build-vk-Release(CI)Behavioral parity checks
vk_add_attachment_desc_softsoft-fail API and Forward+ descriptor-pool invalidation guards preserved per regression test.vk.cubemapActivenever setqtrue) per existing guardrail.