Consolidate ClosureCompound with Compound C++ node#2410
Merged
jstone-lucasfilm merged 2 commits intoMay 27, 2025
Merged
Conversation
| shadergen.emitString(_functionName + "(", stage); | ||
|
|
||
| string delim = ""; | ||
| // Check if we have a closure context to modify the function call. |
Contributor
There was a problem hiding this comment.
Not related to your changes, but perhaps it's a good opportunity to improve this old code comment. Since the closure context is not visible here anymore this comment is a bit confusing.
So could be changed to something like: "Add an argument for closure data if needed"
| return outputs[0]->getType().isClosure(); | ||
| } | ||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
Nitpick: Extra newline
niklasharrysson
approved these changes
May 25, 2025
niklasharrysson
left a comment
niklasharrysson
left a comment
Contributor
There was a problem hiding this comment.
Looks good to me! Just added two minor comments above.
… the previous work done for SourceCodeNode.cpp. Also added an additional helper call to consolidate the logic.
ld-kerley
force-pushed
the
consolidate-compound-node
branch
from
cb45447 to
ef4440b
Compare
jstone-lucasfilm
merged commit 6e2c64d
into
AcademySoftwareFoundation:main
32 checks passed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Similar to the recent work in #2400.
This PR consolidates the few minor differences left between the ClosureCompound and Compound C++ nodes., further reducing the complexity of the C++ implementation nodes.
Also consolidates the logic used to determine if the output is a closure, to be shared here and with the SourceCode node.