Autodesk: Bugfix - Avoid name collision with MaterialX inputs and built-in uniforms #2807
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
Storm injects a built-in scale and bias uniform for texture types. When using materialx graphs, this can cause name collision when materialx inputs. For example if a node has inputs called normal (texture) and normal_scale (float), this will conflict when storm adds a normal_scale (for texture). The workaround or fix is to use a unique name. We use a named suffix _hdSt_ to define Storm generated uniforms.
|
Filed as internal issue #USD-8944 |
|
Hi Erika. I'm seeing changes in the dev branch from PR #2807 in the
codeGen.cpp file. Maybe there was a delay? Could you check again?
…On Fri, Dec 15, 2023 at 3:09 PM Erika Harrison ***@***.***> wrote:
Hi @jesschimein <https://github.com/jesschimein> - I see this is marked
as merged, but I'm not setting the changes in the dev branch for
codeGen.cpp nor in the commit history.
https://git.autodesk.com/autodesk-forks/USD/commits/dev/pxr/imaging/hdSt/codeGen.cpp
Is this expected, or is there a delay, or other?
—
Reply to this email directly, view it on GitHub
<#2807 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ARL2WZOYSF3YDG6XUWDY7QTYJTKA7AVCNFSM6AAAAAA7GV2K26VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNJYGU4TGNBTGQ>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Sorry about that - I think I was getting the repos mixed up and there was a delay. 🤪 |
|
No worries! Glad it appears to be synced now!
…On Mon, Jan 8, 2024 at 2:23 PM Erika Harrison ***@***.***> wrote:
Sorry about that - I think I was getting the repos mixed up and there was
a delay. 🤪
—
Reply to this email directly, view it on GitHub
<#2807 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ARL2WZKCW222R2PF3L5JLJ3YNRWUJAVCNFSM6AAAAAA7GV2K26VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQOBRHEYTINZVGE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
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)
Fix uniform name conflicts in Storm. Storm injects a built-in scale and bias uniform for texture types. When using MaterialX graphs, this can cause name collision with MaterialX inputs. For example if a node has inputs called normal (texture) and normal_scale (float), this will conflict when storm adds a normal_scale (for texture). The workaround or fix is to use a unique name. We use a named suffix _hdSt_ to define Storm generated uniforms.
Fixes Issue(s)