Vulkan: remove dead USE_UPLOAD_QUEUE branches; trim redundant USE_FOG_ONLY guard#51
Draft
cursor[bot] wants to merge 2 commits intomainfrom
Draft
Vulkan: remove dead USE_UPLOAD_QUEUE branches; trim redundant USE_FOG_ONLY guard#51cursor[bot] wants to merge 2 commits intomainfrom
cursor[bot] wants to merge 2 commits intomainfrom
Conversation
USE_UPLOAD_QUEUE was never defined in CMake or headers, so the alternate batched-staging upload path and related frame submit wiring were unreachable. Keep the one-time command buffer upload path as the only implementation and simplify vk_end_command_buffer submit (no optional semaphore wait). Co-authored-by: Tim Fox <timfox@outlook.com>
USE_FOG_ONLY is always defined before the guard, so the nested #if was a no-op. 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
Cleanup of compile-time “feature flag” branches that were never enabled in production builds.
Flags / toggles removed
USE_UPLOAD_QUEUE(compile-time): Removed all#ifdef USE_UPLOAD_QUEUE/#ifndef USE_UPLOAD_QUEUEbranches and the associated staging helpers (vk_wait_staging_buffer,vk_flush_staging_buffer). This macro was not defined anywhere in CMake or engine headers, so the batched upload / extra submit path was dead code. The active path remains per-upload one-shot command buffers (vk_begin_command_buffer/vk_end_command_buffer), unchanged in behavior.Redundant
USE_FOG_ONLYguard intr_local.h:USE_FOG_ONLYwas already defined unconditionally; the nested#if defined(USE_VBO) && !defined(USE_FOG_ONLY)block was a no-op and was removed.Why this is safe
USE_UPLOAD_QUEUE: Grep across the repo showed no definition; only#ifdefsites. Deleting the false branch preserves the code path that was actually compiled and linked today.USE_FOG_ONLY: Removing a preprocessor block that could never change the effective define; no functional change.Behavioral parity checks
idtech3_vulkan_x86).ctestinbuild-vk-Release: all 17 tests passed (smoke, renderer regression check, unit tests).Commits
refactor(vulkan): remove dead USE_UPLOAD_QUEUE compile brancheschore(vulkan): drop redundant USE_FOG_ONLY preprocessor guard