Feature-flag cleanup: remove stale Vulkan compile-time gates#290
Draft
cursor[bot] wants to merge 6 commits into
Draft
Feature-flag cleanup: remove stale Vulkan compile-time gates#290cursor[bot] wants to merge 6 commits into
cursor[bot] wants to merge 6 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>
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 Vulkan compile-time feature flags and dead
#elsebranches that can no longer execute.USE_VK_PBRis unconditionally defined intr_local.h; the non-PBR fallback paths were unreachable dead code.Branch:
cursor/feature-flag-cleanup-6b50→mainFlags removed
USE_VBO_GRIDUSE_VBOis on (always); grid VBO path is the only compiled pathUSE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2tr_local.h;#ifdefblocks were never activeUSE_VK_PBRdead#elsebranchesUSE_VK_PBRis#defined unconditionally; all#elsefallbacks were unreachableVK_CUBEMAP/VK_PBR_BRDFLUTunderUSE_VK_PBR(void)0#elsevk_shader_modules.c#ifndef USE_VK_PBRtableFiles touched (20)
Primarily
renderers/vulkan/:tr_local.h,vk_vbo.c,vk_shader_modules.c,vk_shutdown.c,vk_create_pipeline.c,vk_draw_state.c,vk.h,vk_attachments.c,vk_forward_plus.c,vk_reactive_mask.c,tr_surface.c,tr_shade.c,tr_bsp.c,tr_bsp_stream.c,tr_shader_load.inc,tr_material_paint.c,tr_animation.c,tr_main.c,vk_pbr_ibl_validate.c,extensions/rtx/vk_rtx_world.cStats: 20 files, ~716 lines removed
Behavioral parity checks performed
tests/scripts/test_vulkan_regression_source_guards.sh— PASSUSE_VBO_GRID,USE_TESS_NEEDS_*,#ifndef USE_VK_PBRinrenderers/vulkan/Not in scope (low confidence)
One-sided
#ifdef USE_VK_PBRwrappers without#else(e.g.vk_attachments.ccube view-type path) remain — they are always-on but harmless; unwrapping them is a larger cosmetic diff.Test plan
tests/scripts/test_vulkan_regression_source_guards.sh./scripts/smoke_test.sh ./build-vk-Release(headless VM: server/binary checks only)