Fix enumeration interfacename bug#2423
Merged
ld-kerley merged 2 commits intoJun 3, 2025
Merged
Conversation
niklasharrysson
approved these changes
Jun 3, 2025
niklasharrysson
left a comment
Contributor
There was a problem hiding this comment.
This looks like a good fix! Thanks @ld-kerley
kwokcb
reviewed
Jun 3, 2025
| std::pair<TypeDesc, ValuePtr> enumResult; | ||
| const string& enumNames = nodeDefInput->getAttribute(ValueElement::ENUM_ATTRIBUTE); | ||
| const TypeDesc type = context.getTypeDesc(nodeDefInput->getType()); | ||
| if (context.getShaderGenerator().getSyntax().remapEnumeration(valueString, type, enumNames, enumResult)) |
Contributor
There was a problem hiding this comment.
The "bug" appears to be in GLSL and MSL remapEnumeration method. It is returning true when there is no value mapped. MDL returns the correct value of false in this case.
Contributor
Author
There was a problem hiding this comment.
Chatted offline with Bernard - we still think the original fix is valid - but I'm gonna put up a PR to fix the return value from remapEnumeration as well.
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
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.
Related to #2422.
When creating the
Input, during construction of the graph for code generation, currently if an enumeration is exposed viainterfacename, then thevaluemember ends up getting set tonullptr, which means later the code generation cannot determine the correct type.This PR guards the setting of the value, to avoid setting this to
nullptr.