Add fallbacks for findUniform methods #2150
Conversation
This changelist adds fallbacks to the GlslMaterial::findUniform and MslMaterial::findUniform methods, allowing them to find matches for uniforms that don't yet have a full path. This addresses issue AcademySoftwareFoundation#1782.
jstone-lucasfilm
merged commit af74b61
into
AcademySoftwareFoundation:main
| { | ||
| port = publicUniforms->find([path](ShaderPort* port) | ||
| { | ||
| return (port && stringEndsWith(path, port->getName())); |
There was a problem hiding this comment.
Just wondering if this might be cleaner (and more efficient?) if we folded this check inside the one above?
port = publicUniforms->find([path](ShaderPort* port)
{
return (port && (stringEndsWith(port->getPath(), path) || stringEndsWith(path, port->getName()));
});
There was a problem hiding this comment.
That's a good instinct from an efficiency perspective, though in this case it would alter the results of the function in a way that we don't intend, allowing the fallback logic to affect searches that already successfully found matches.
As this logic is currently written, if the first search succeeds, then the fallback logic is entirely skipped, making it so that only failure cases for the original function are extended by the fallback behavior.
There was a problem hiding this comment.
makes sense - thanks for the clarification.
I wonder if it's helpful to add a code comment to that effect - to avoid someone thinking there is a potential optimization here in the future?
This changelist adds fallbacks to the GlslMaterial::findUniform and MslMaterial::findUniform methods, allowing them to find matches for uniforms that don't yet have a full path.
This addresses issue #1782.