Vulkan: remove stale USE_VK_PBR, USE_VBO_GRID, and USE_TESS_NEEDS flags#267
Draft
cursor[bot] wants to merge 2 commits into
Draft
Vulkan: remove stale USE_VK_PBR, USE_VBO_GRID, and USE_TESS_NEEDS flags#267cursor[bot] wants to merge 2 commits into
cursor[bot] wants to merge 2 commits into
Conversation
- Drop dead non-PBR shader module init path in vk_shader_modules.c (USE_VK_PBR is unconditionally defined in tr_local.h). - Unwrap USE_VBO_GRID ifdefs; grid surfaces always use the VBO path when USE_VBO is enabled. - Remove disabled USE_TESS_NEEDS_NORMAL/ST2 compile gates and the write-only DetectNeeds() shader metadata they fed. - Preserve active-path behavior: tessellation still gathers normals and lightmap ST2 unconditionally, matching the prior undefined-flag builds. 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
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.
Flags removed
#elsebranch (vk_shader_modules.c)USE_VK_PBRis unconditionally#defined intr_local.h; the non-PBR shader module init path was dead code (~120 lines).USE_VBOintr_local.h; grid surfaces always take the VBO path in production builds. Unwrapped invk_vbo.c,tr_surface.c, andtr_local.h.DetectNeeds()/shader.needsNormal/shader.needsST2metadata they fed. Active behavior preserved: tessellation still gathers normals and lightmap ST2 unconditionally (matching prior undefined-flag builds).Behavioral parity
vk_bind_generated_shaders()unchanged.Validation
./scripts/compile_engine.sh vulkan— pass./tests/scripts/test_vulkan_regression_source_guards.sh— pass./scripts/smoke_test.sh— passCandidates not touched (low confidence)
r_renderMode,r_forwardPlus,r_vbo,r_pbr,r_volumetricFog, RTX cvars, broaderUSE_VK_PBR/USE_VBOifdef unwrapping,SKIP_IDPAK_CHECK.