Fix EX31 warmup, rectangle area, and RWMC runtime path#264
Open
AnastaZIuk wants to merge 3 commits intopath_tracer_beautyfrom
Open
Fix EX31 warmup, rectangle area, and RWMC runtime path#264AnastaZIuk wants to merge 3 commits intopath_tracer_beautyfrom
AnastaZIuk wants to merge 3 commits intopath_tracer_beautyfrom
Conversation
Member
Author
|
CI failing due to microsoft/DirectXShaderCompiler#8324, fix about to enter master and we will pull it here |
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
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
Areaselection resolve to a real packaged variant inside the existing variant graph instead of a UI choice that can drift from effective selectionpath_tracer_beautyRoot cause
The current EX31 branch has two separate regressions.
First, the startup and warmup path stopped following the branch's effective packaged variants. The initial runtime-side startup selection came in
25d3f009, and3b9b2f32widened that path by preloading the startup shader and resolve shader before the first submit. After the later variant reshapes in13f09209,520e26fb, and7e0e7f98, EX31 still keyed startup and warmup from the UI-sideusePersistentWorkGroupsbit instead of the branch's effective packaged-variant contract. The same7e0e7f98change also introducedrender_variant_info.hppwith rectangle hard-wired toSOLID_ANGLE, so the UI could exposeAreawhile effective selection never reached a real rectangle-area packaged variant.Second, RWMC drifted in a later same-day refactor sequence.
2e90b9f0replaced the old scramble-sequence path withCCachedOwenScrambledSequence.hppandKeyedQuantizedSequence.hlsl, and that commit already notes that the new HLSL decoder was broken.02717101moved EX31 onto that decoder and resynced the main push constants, but the resolve-siderwmcParams.sampleCountno longer followed the activespp.5d3b3b27then adapted EX31 after persistent-workgroup and RWMC breakage showed up, but runtime selection, resolve configuration, and the compiled entrypoint surface still did not line up cleanly. This PR makes those paths agree again around the persistent packaged variants the branch actually uses.The RWMC-parameter brightness drift is older than this branch.
64ba310bintroduced the long-lived EX31 RWMC default pack withkappa = 5.0, and the same defaults remained onmaster. That was not the cause of the branch runtime regressions above, but it made RWMC versus non-RWMC comparisons depend too much on leftover UI state. This PR also resets EX31 to a stable comparison baseline and adds a directReset RWMCcontrol so those comparisons are reproducible.