ShaderTools: Fix inconsistency between ProcessShaderIncludesImpl/UnrollShaderIncludesImpl and DXC/FXC#798
Open
hzqst wants to merge 3 commits into
Open
ShaderTools: Fix inconsistency between ProcessShaderIncludesImpl/UnrollShaderIncludesImpl and DXC/FXC#798hzqst wants to merge 3 commits into
ProcessShaderIncludesImpl/UnrollShaderIncludesImpl and DXC/FXC#798hzqst wants to merge 3 commits into
Conversation
5bb5eb9 to
dfe7fbf
Compare
df15a18 to
50f6538
Compare
…arent-relative probing for quoted includes.
…ked shader package using portable / names would still fail with MemoryShaderSourceFactory" and "a system/angle include can silently become parent-relative in the scanner"
13622a5 to
c7c690c
Compare
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.
Fix #797
The regression test
IncludeNestedParentRelativereproduces the exact 2-level nested scenario. Without the fix, processingConfig.hlslas a bare name throws (Config.hlsllives only inNested/), soProcessShaderIncludesreturns false — the test would fail. With the fix it passes.