usdBakeMtlx: absorb TextureBakerGlsl API change to fix compilation with MaterialX 1.38.7 #2402
Conversation
This file contains 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
…th MaterialX 1.38.7 As part of the work to support Metal in MaterialX, the API for creating a GLSL-based texture baker was modified in 1.38.7. This change ensures that the correct type name is used based on the MaterialX version being used. See more detail in the MaterialX commit here: AcademySoftwareFoundation/MaterialX@6f8b3bd
|
Filed as internal issue #USD-8266 |
pixar-oss
pushed a commit
that referenced
this pull request
May 19, 2023
- Makes the MaterialX shader generator polymorphic and implements the Metal based functionality. - Metal versions 2.2 and earlier don't return upon usage of the discard keyword. Improve discard handling to pass MaterialX unit tests on Metal. - The API for creating a GLSL-based texture baker was modified in 1.38.7. This change ensures that the correct type name is used. Based on github pull request #1965, which was authored by Pablo Delgado Based on github pull request #2324, which was Co-authored by Morteza Mostajabodaveh & Jon Creighton Based on github pull request #2402, which was authored by Matt Johnson Fixes #1965 Fixes #2216 Fixes #2324 Fixes #2402 (Internal change: 2275890)
mattyjams
deleted the
pr/fix_usdBakeMtlx_compilation_with_MaterialX_1_38_7
branch
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.
Description of Change(s)
As part of the work to support Metal in MaterialX, the API for creating a GLSL-based texture baker was modified in 1.38.7. This change ensures that the correct type name is used based on the MaterialX version being used.
See more detail in the MaterialX commit here:
AcademySoftwareFoundation/MaterialX@6f8b3bd
I've verified that the unit tests pass when USD is built against MaterialX 1.38.7, but I've admittedly not done any other correctness verification. This change only addresses the compilation failure.