Vulkan: remove dead non-PBR shader module init path#200
Draft
cursor[bot] wants to merge 1 commit into
Draft
Conversation
USE_VK_PBR is unconditionally defined in tr_local.h for the Vulkan renderer, so the #else branch in vk_create_shader_modules() never compiled. Remove the stale conditional and legacy SPIR-V wiring to keep a single PBR initialization path. 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 unreachable initialization code in
vk_create_shader_modules()that assumed the Vulkan renderer could be built withoutUSE_VK_PBR.Flags / compile gates
#ifdef USE_VK_PBR/#elsebranch insrc/renderers/vulkan/vk_shader_modules.c(the#elselegacy SPIR-V module wiring).USE_VK_PBRis unconditionally#defined insrc/renderers/vulkan/tr_local.hfor this renderer, so the#elsenever compiled. Runtime behavior matches the previous active (PBR) path:vk_bind_generated_shaders()followed by the shared post-processing and utility modules.Behavioral parity
./scripts/compile_engine.sh vulkan(Release) — succeeded.ctest --output-on-failureinbuild-vk-Release— 26/26 passed (smoke, renderer checks, unit tests).Notes
The
USE_VK_PBRmacro remains in the tree for shader templates and the rest of the Vulkan sources; this change only removes the obsolete non-PBR module setup that could not be selected with the current headers.