chore: remove stale Vulkan compile-time feature flags#292
Draft
cursor[bot] wants to merge 7 commits into
Draft
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
Removes stale compile-time feature flags in the Vulkan renderer that are permanently on or off and no longer gate alternate code paths.
Flags removed
USE_VBO_GRIDUSE_VBOis on (tr_local.h); grid surfaces always use the VBO pathUSE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2USE_VK_PBR#elsebranchesUSE_VK_PBRis unconditionally#defined; non-PBR fallback paths were unreachable dead codeVK_CUBEMAP/VK_PBR_BRDFLUTunderUSE_VK_PBRtr_local.h(shader compile still uses-DUSE_VK_PBR)~742 lines removed across 20 renderer files (shader init/teardown, draw/pipeline, BSP/RTX, reactive mask, VBO grid paths).
Behavioral parity
VERTEXSIZE11), VBO grid upload, cubemap/BRDF-LUT IBL scaffolding, and shader module tables remain as before.Candidates not touched (low confidence)
#ifdef USE_VK_PBRblocks still used for shader variant selectionr_forwardPlus,r_rtx, etc.)USE_VULKAN_RTX,USE_EXPERIMENTAL_RENDERERS)Test plan
./tests/scripts/test_vulkan_regression_source_guards.sh— PASSUSE_VBO_GRID,USE_TESS_NEEDS_*, or#ifndef USE_VK_PBRinrenderers/./scripts/bootstrap.sh engine./scripts/smoke_test.sh ./build-vk-Releasedocs/ENGINE_MODULE_MANIFEST.md)./scripts/ci/audit_unconditional_sources.sh(when touching CMake source lists)