Skip to content

Remove reservedWords from ShaderGraph constructor #2600

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
ld-kerley merged 1 commit into from
Oct 2, 2025
Merged

Remove reservedWords from ShaderGraph constructor #2600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions source/MaterialXGenShader/ShaderGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MATERIALX_NAMESPACE_BEGIN
// ShaderGraph methods
//

ShaderGraph::ShaderGraph(const ShaderGraph* parent, const string& name, ConstDocumentPtr document, const StringSet& /*reservedWords*/) :
ShaderGraph::ShaderGraph(const ShaderGraph* parent, const string& name, ConstDocumentPtr document) :
ShaderNode(parent, name),
_document(document)
{
Expand Down Expand Up @@ -438,7 +438,7 @@ ShaderGraphPtr ShaderGraph::create(const ShaderGraph* parent, const NodeGraph& n

string graphName = nodeGraph.getName();
context.getShaderGenerator().getSyntax().makeValidName(graphName);
ShaderGraphPtr graph = std::make_shared<ShaderGraph>(parent, graphName, nodeGraph.getDocument(), context.getReservedWords());
ShaderGraphPtr graph = std::make_shared<ShaderGraph>(parent, graphName, nodeGraph.getDocument());

// Clear classification
graph->_classification = 0;
Expand Down Expand Up @@ -497,7 +497,7 @@ ShaderGraphPtr ShaderGraph::create(const ShaderGraph* parent, const string& name
throw ExceptionShaderGenError("Given output '" + output->getName() + "' has no interface valid for shader generation");
}

graph = std::make_shared<ShaderGraph>(parent, name, element->getDocument(), context.getReservedWords());
graph = std::make_shared<ShaderGraph>(parent, name, element->getDocument());

// Clear classification
graph->_classification = 0;
Expand Down Expand Up @@ -533,7 +533,7 @@ ShaderGraphPtr ShaderGraph::create(const ShaderGraph* parent, const string& name
throw ExceptionShaderGenError("Could not find a nodedef for node '" + node->getName() + "'");
}

graph = std::make_shared<ShaderGraph>(parent, name, element->getDocument(), context.getReservedWords());
graph = std::make_shared<ShaderGraph>(parent, name, element->getDocument());

// Create input sockets
graph->addInputSockets(*nodeDef, context);
Expand Down
2 changes: 1 addition & 1 deletion source/MaterialXGenShader/ShaderGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class MX_GENSHADER_API ShaderGraph : public ShaderNode
{
public:
/// Constructor.
ShaderGraph(const ShaderGraph* parent, const string& name, ConstDocumentPtr document, const StringSet& reservedWords);
ShaderGraph(const ShaderGraph* parent, const string& name, ConstDocumentPtr document);

/// Destructor.
virtual ~ShaderGraph() { }
Expand Down
⚡