Remove stale Vulkan compile gates (USE_VK_PBR, RENDERER_OPENGL, USE_TESS_NEEDS_*)#250
Draft
cursor[bot] wants to merge 3 commits into
Draft
Remove stale Vulkan compile gates (USE_VK_PBR, RENDERER_OPENGL, USE_TESS_NEEDS_*)#250cursor[bot] wants to merge 3 commits into
cursor[bot] wants to merge 3 commits into
Conversation
- Drop non-PBR shader module registration branch (USE_VK_PBR is always defined) - Remove RENDERER_OPENGL glTF shader path; Vulkan-only loader remains - Remove stale r_fastsky portal comment and duplicate r_imgui cvar declarations Co-authored-by: Tim Fox <timfox@outlook.com>
… Vulkan Vulkan never defined USE_TESS_NEEDS_NORMAL or USE_TESS_NEEDS_ST2, so all guarded branches behaved as always-on. OpenGL never defined USE_TESS_NEEDS_ST2 (lightmap texcoord path was unconditional at compile time). - Vulkan: drop tess/shader needs* fields, RB_BeginSurface propagation, DetectNeeds(), and redundant #ifdef/if wrappers. - OpenGL: drop needsST2 from shader/tess, ST2-only DetectNeeds branch, and matching surface/VBO/shade wrappers; keep USE_TESS_NEEDS_NORMAL path. Build: compile_engine.sh opengl + vulkan; ctest in build-vk-Release (26/26). 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
USE_VK_PBR#elsebranch (vk_shader_modules.c)USE_VK_PBRis unconditionally#defined intr_local.hfor all Vulkan builds; the non-PBR shader registration path was unreachable dead code (~120 lines).RENDERER_OPENGLglTF path (tr_model_gltf.c)USE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2(Vulkan tessellation)tr_local.h), so all#ifdefbranches compiled as always-on. RemovedneedsNormal/needsST2fields,DetectNeeds(), and redundant wrappers intr_surface.c,tr_shade.c,tr_animation.c,vk_vbo.c,tr_shader.c,tr_main.c.r_imguicvar declaration (tr_init.c)r_studio_tools) is the canonical one; first block was redundant.r_fastskyportal comment (tr_main.c)Behavioral parity
./scripts/compile_engine.sh vulkan— success (Release).test_openworld,test_openworld_runtime— zip packaging) reproduce onmainunchanged.tests/scripts/test_vulkan_regression_source_guards.sh— PASS.scripts/q3_openarena_compat_check.sh— 13/13 PASS.Candidates not removed (low confidence)
r_forwardPlus,r_renderMode,r_vbo, RTX/VDB toggles.USE_VBO_GRID/USE_VBOcompile wrappers — always on but large#ifdefsurface; needs dedicated pass.r_allowSoftwareGL/r_glDriver— legacy cvars still referenced in platformsdl_glimp.cOpenGL attribute path.