Further Linux tests. OS/X fix.

autodesk-forks · Oct 24, 2024 · c712dda · c712dda
1 parent 42f76c1
commit c712dda
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/python/Scripts/generateshader.py b/python/Scripts/generateshader.py
@@ -143,8 +143,6 @@ def main():
         nodes = mx_gen_shader.findRenderableElements(doc)
         if not nodes:
             nodes = doc.getMaterialNodes()
-            if not nodes:
-                nodes = doc.getNodesOfType(mx.SURFACE_SHADER_TYPE_STRING)
 
         pathPrefix = ''
         if opts.outputPath and os.path.exists(opts.outputPath):

diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
@@ -79,6 +79,14 @@ void checkImplementations(mx::GenContext& context,
     const auto alllibs = loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib" }, searchPath, doc);
     for (const auto& mxlib: alllibs) {
         std::cout << "\t" << mxlib << std::endl;
+        if (mxlib.find("genglsl/mx39_pbrlib") != std::string::npos) {
+            std::cerr << "\tAlso in this folder:" << std::endl;
+            mx::FilePath path(mxlib);
+            for (const auto& file : path.getParentPath().getFilesInDirectory("glsl"))
+            {
+                std::cerr << "\t\t" << file.asString() << std::endl;
+            }
+        }
     }
 
     const std::string& target = shadergen.getTarget();