Move resolving #includes from MaterialBuilder to MaterialCompiler #9374
+181
−206
Conversation
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
pixelflinger
requested review from
bejado,
pixelflinger,
poweifeng and
z3moon
and removed request for
poweifeng
z3moon
reviewed
Oct 28, 2025
trie94
force-pushed
the
yeinj/includer
branch
from
856a115 to
2fb2583
Compare
z3moon
approved these changes
Oct 28, 2025
trie94
force-pushed
the
yeinj/includer
branch
from
2fb2583 to
7b71dec
Compare
poweifeng
approved these changes
Nov 4, 2025
bejado
approved these changes
Nov 4, 2025
tools/matc/src/matc/Includes.h
Outdated
| size_t startPosition; | ||
| size_t length; | ||
| size_t line; // the line number the include was found on (first line is 1) | ||
| size_t line; // the line number the #include was found on. |
There was a problem hiding this comment.
Is the first line now 0? Maybe we should update the comment here
bejado
approved these changes
Nov 4, 2025
pixelflinger
approved these changes
Nov 4, 2025
trie94
force-pushed
the
yeinj/includer
branch
from
7b71dec to
b59c4ad
Compare
…fore parsing the material. - resolving #includes was happening after parsing, now moving before parsing. this is because we could offload this resolution at build time for RuntimeMaterialCompiler - filamat::resolveIncludes used to have an assumption where the given text was already a shader block. this assumption is now broken so it finds the line offset internally. thus the line offset field is removed from IncludeResult.
trie94
force-pushed
the
yeinj/includer
branch
from
b59c4ad to
7415c9e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Move resolving #includes from MaterialBuilder to MaterialCompiler before parsing the material.
Some details:
Follow up (in a separate PR):
We will add a resolveIncludes flag in the CommandlineConfig and allows matc to return unresolved mat to resolved mat.