Add fallbacks for findUniform methods (#2150)

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.
AcademySoftwareFoundation · Dec 17, 2024 · af74b61 · af74b61
1 parent 31ca71b
commit af74b61
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/source/MaterialXRenderGlsl/GlslMaterial.cpp b/source/MaterialXRenderGlsl/GlslMaterial.cpp
@@ -331,6 +331,13 @@ ShaderPort* GlslMaterial::findUniform(const std::string& path) const
         {
             return (port && stringEndsWith(port->getPath(), path));
         });
+        if (!port)
+        {
+            port = publicUniforms->find([path](ShaderPort* port)
+            {
+                return (port && stringEndsWith(path, port->getName()));
+            });
+        }
 
         // Check if the uniform exists in the shader program
         if (port && !_glProgram->getUniformsList().count(port->getVariable()))

diff --git a/source/MaterialXRenderMsl/MslMaterial.mm b/source/MaterialXRenderMsl/MslMaterial.mm
@@ -292,6 +292,13 @@
         {
             return (port && stringEndsWith(port->getPath(), path));
         });
+        if (!port)
+        {
+            port = publicUniforms->find([path](ShaderPort* port)
+            {
+                return (port && stringEndsWith(path, port->getName()));
+            });
+        }
 
         // Check if the uniform exists in the shader program
         if (port && !_glProgram->getUniformsList().count(