Support returning an inlined .mat of the given .mat in matc #9399
+30
−3
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
approved these changes
Nov 4, 2025
poweifeng
approved these changes
Nov 4, 2025
bejado
approved these changes
Nov 4, 2025
…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. # Conflicts: # libs/filamat/CMakeLists.txt # libs/filamat/include/filamat/Includes.h # libs/filamat/src/Includes.h # libs/filamat/tests/test_filamat.cpp # tools/matc/src/matc/Includes.h # tools/matc/src/matc/MaterialCompiler.cpp # tools/matc/tests/MockIncluder.h # tools/matc/tests/test_includes.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Support returning an inlined .mat of the given .mat in matc
(This is dependent on #9374)