ShaderTools: Update GLSLangUtil's includeLocal to match the DXC/FXC behavior.#799
Open
hzqst wants to merge 5 commits into
Open
ShaderTools: Update GLSLangUtil's includeLocal to match the DXC/FXC behavior.#799hzqst wants to merge 5 commits into
hzqst wants to merge 5 commits into
Conversation
TheMostDiligent
force-pushed
the
development
branch
8 times, most recently
from
June 27, 2026 15:44
13622a5 to
c7c690c
Compare
Preserve local and system include semantics when processing and unrolling shader includes. Support both path separators for memory-backed source factories and add regression tests.
Add PathRootType and GetPathRootType() to distinguish Unix, Windows drive, and UNC roots regardless of the host platform.
Add JoinPath() to combine a base path with a relative path fragment, normalize boundary separators, and preserve Unix, drive, and UNC roots.
Normalize shader source paths across filesystem, memory, and compound stream factories. Resolve local includes relative to the including source while preserving Unix, drive, and UNC roots.
Pass source names to glslang and resolve local includes relative to the including file. Normalize resolved paths before querying shader source factories while preserving root lookup for system includes.
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
2 participants
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.
Also with a test to cover the nested directory-relative include cases.
This is a subsequent task of #798.