Remove stale Vulkan compile-time feature flags (USE_VK_PBR #else, USE_VBO_GRID, USE_TESS_NEEDS)#284
Draft
cursor[bot] wants to merge 3 commits into
Draft
Remove stale Vulkan compile-time feature flags (USE_VK_PBR #else, USE_VBO_GRID, USE_TESS_NEEDS)#284cursor[bot] wants to merge 3 commits into
cursor[bot] wants to merge 3 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>
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 dead compile-time feature-flag branches in the Vulkan renderer that are permanently enabled (or permanently disabled) in
tr_local.h. No runtime behavior change on shipping builds.Flags removed / unwrapped
#else#define USE_VK_PBRis unconditional intr_local.h; non-PBR shader init/teardown and pipeline paths were unreachable dead code.USE_VBOis on (also unconditional); grid-VBO paths are the only active path.tr_local.h; guarded tess plumbing never compiled.11(PBR vertex layout), matching the only active configuration.Files touched
tr_local.h,tr_animation.c,tr_main.c,tr_shade.c,tr_surface.cvk_shader_modules.c,vk_shutdown.c,vk_vbo.c,vk_pbr_ibl_validate.cvk.h,vk_attachments.c,vk_create_pipeline.c,vk_draw_state.c,vk_forward_plus.c,tr_material_paint.cBehavioral parity checks
./tests/scripts/test_vulkan_regression_source_guards.sh— PASSmain(3 commits, ~660 lines removed)./scripts/compile_engine.sh vulkan core— blocked by pre-existingtr_image_exr.cppinclude-path failure (unrelated to this diff)Candidates deferred (low confidence)
#ifdef USE_VK_PBRblocks intr_shader.c/tr_local.h(struct members and runtimevk.pbrActivegates — larger unwrap, separate PR)r_forwardPlus,r_renderMode,r_pbr) — intentional toggles, not compile-time flagsTest plan
./tests/scripts/test_vulkan_regression_source_guards.sh./scripts/smoke_test.sh ./build-vk-Release(blocked by unrelated EXR loader build issue in this environment)