Skip to content

Stricter check for eliding for Shader Optimization #2754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 3 commits into from
Jan 30, 2026
Merged

Stricter check for eliding for Shader Optimization #2754

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ad4590
Stricter check to check if we can elide
bowald Jan 19, 2026
2ef2424
Merge branch 'main' into fix/shadergen-bypass-issues
jstone-lucasfilm Jan 28, 2026
0f1909b
code cleanup, improved comments
bowald Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions source/MaterialXGenShader/ShaderGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void ShaderGraph::createConnectedNodes(const ElementPtr& downstreamElement,
{
continue;
}

InputPtr graphInput = activeInput->getInterfaceInput();
if (graphInput && graphInput->hasDefaultGeomPropString())
{
Expand Down Expand Up @@ -978,9 +978,9 @@ void ShaderGraph::optimize(GenContext& context)
{
if (node->hasClassification(ShaderNode::Classification::CONSTANT))
{
if (node->numInputs() == 0)
if (node->numInputs() != 1 || node->numOutputs() != 1)
{
// Cannot elide a constant node with no inputs.
// Constant node doesn't follow expected interface, cannot elide.
continue;
}
// Constant nodes can be elided by moving their value downstream.
Expand All @@ -1003,9 +1003,9 @@ void ShaderGraph::optimize(GenContext& context)
}
else if (node->hasClassification(ShaderNode::Classification::DOT))
{
if (node->numInputs() == 0)
if (node->numOutputs() != 1)
{
// Cannot elide a dot node with no inputs.
// Dot node dosen't follow expected interface, cannot elide.
continue;
}
// Filename dot nodes must be elided so they do not create extra samplers.
Expand Down