Merge branch 'AcademySoftwareFoundation:main' into plugin_manager

Author: kwokcb

.github/workflows/main.yml

@@ -78,6 +78,7 @@ jobs:
           compiler_version: "16.4"
           python: 3.13
           test_shaders: ON
+          test_render: ON
 
         - name: MacOS_Xcode_26_Python313
           os: macos-26
@@ -229,6 +230,7 @@ jobs:
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target osl
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target mdl
         python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target msl
+        python Scripts/generateshader.py ../resources/Materials/Examples/StandardSurface --target slang
       working-directory: python
 
     - name: Shader Validation Tests (Windows)
@@ -265,25 +267,40 @@ jobs:
         fi
         cppcheck --project=build/compile_commands.json --error-exitcode=1 --suppress=normalCheckLevelMaxBranches --suppress=*:*/External/* --suppress=*:*/NanoGUI/*
 
-    - name: Initialize Virtual Framebuffer
+    - name: Setup Rendering Environment (Linux)
       if: matrix.test_render == 'ON' && runner.os == 'Linux'
       run: |
         Xvfb :1 -screen 0 1280x960x24 &
         echo "DISPLAY=:1" >> $GITHUB_ENV
         echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
 
+    - name: Setup Rendering Environment (MacOS)
+      if: matrix.test_render == 'ON' && runner.os == 'macOS'
+      run: |
+        # macOS can render headless with Metal backend without virtual display
+        # Force software rendering for Metal backend (more reliable in CI)
+        echo "MTL_HARDWARE_RENDERING=0" >> $GITHUB_ENV
+        # Enable Metal debug layer for better debugging in CI
+        echo "MTL_DEBUG_LAYER=1" >> $GITHUB_ENV
+        echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
+
     - name: Render Script Tests
       if: matrix.test_render == 'ON'
       run: |
         mkdir build/render
         python python/Scripts/baketextures.py resources/Materials/Examples/StandardSurface/standard_surface_brass_tiled.mtlx build/render/brass_average_baked.mtlx --average
         python python/Scripts/translateshader.py resources/Materials/Examples/StandardSurface/standard_surface_carpaint.mtlx build/render/usd_preview_surface_carpaint.mtlx UsdPreviewSurface --hdr
 
-    - name: Render Application Tests
+    - name: Viewer Tests 
       if: matrix.test_render == 'ON'
       run: |
         ../installed/bin/MaterialXView --material brass_average_baked.mtlx --mesh ../../resources/Geometry/sphere.obj --screenWidth 128 --screenHeight 128 --cameraZoom 1.4 --shadowMap false --captureFilename Viewer_BrassAverage.png
         ../installed/bin/MaterialXView --material usd_preview_surface_carpaint.mtlx --mesh ../../resources/Geometry/sphere.obj --screenWidth 128 --screenHeight 128 --cameraZoom 1.4 --shadowMap false --captureFilename Viewer_CarpaintTranslated.png
+      working-directory: build/render
+
+    - name: Graph Editor Tests
+      if: matrix.test_render == 'ON' && runner.os == 'Linux'
+      run: |
         ../installed/bin/MaterialXGraphEditor --material ../../resources/Materials/Examples/StandardSurface/standard_surface_marble_solid.mtlx --viewWidth 128 --viewHeight 128 --captureFilename GraphEditor_MarbleSolid.png
       working-directory: build/render
 

javascript/MaterialXTest/browser/shaderGenerator.spec.js

@@ -51,6 +51,8 @@ describe('Generate Shaders', function ()
             generators.push(mx.WgslShaderGenerator.create());
         if (typeof mx.MdlShaderGenerator != 'undefined')
             generators.push(mx.MdlShaderGenerator.create());
+        if (typeof mx.SlangShaderGenerator != 'undefined')
+            generators.push(mx.SlangShaderGenerator.create());
 
         const elem = mx.findRenderableElement(doc);
         for (let gen of generators)

python/Scripts/generateshader.py

@@ -11,6 +11,7 @@
 import MaterialX.PyMaterialXGenMdl as mx_gen_mdl
 import MaterialX.PyMaterialXGenMsl as mx_gen_msl
 import MaterialX.PyMaterialXGenOsl as mx_gen_osl
+import MaterialX.PyMaterialXGenSlang as mx_gen_slang
 import MaterialX.PyMaterialXGenShader as mx_gen_shader
 
 def validateCode(sourceCodeFile, codevalidator, codevalidatorArgs):
@@ -102,6 +103,8 @@ def main():
             shadergen = mx_gen_glsl.WgslShaderGenerator.create()
         elif gentarget == 'msl':
             shadergen = mx_gen_msl.MslShaderGenerator.create()
+        elif gentarget == 'slang':
+            shadergen = mx_gen_slang.SlangShaderGenerator.create()
         else:
             shadergen = mx_gen_glsl.GlslShaderGenerator.create()
 

source/JsMaterialX/CMakeLists.txt

@@ -8,6 +8,7 @@ set(GENMSL ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenMsl/)
 set(GENVK ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenVk/)
 set(GENMDL ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenMdl/)
 set(GENWGSL ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenWgsl/)
+set(GENSLANG ${CMAKE_CURRENT_SOURCE_DIR}/JsMaterialXGenSlang/)
 
 set(SOURCE_FOLDER ${PROJECT_SOURCE_DIR}/source)
 
@@ -50,6 +51,7 @@ set(GENMSL_DEPS ${GENMSL}JsMslShaderGenerator.cpp)
 set(GENVK_DEPS ${GENVK}JsVkShaderGenerator.cpp)
 set(GENWGSL_DEPS ${GENWGSL}JsWgslShaderGenerator.cpp)
 set(GENMDL_DEPS ${GENMDL}JsMdlShaderGenerator.cpp)
+set(GENSLANG_DEPS ${GENSLANG}JsSlangShaderGenerator.cpp)
 
 # Linker flags
 set(JS_LINK_FLAGS_CORE "")
@@ -114,6 +116,10 @@ if (MATERIALX_BUILD_GEN_MSL)
     message("JS: Building JsMaterialXGenShader with MSL support")
     target_sources(JsMaterialXGenShader PRIVATE ${GENMSL_DEPS})
 endif()
+if (MATERIALX_BUILD_GEN_SLANG)
+    message("JS: Building JsMaterialXGenShader with Slang support")
+    target_sources(JsMaterialXGenShader PRIVATE ${GENSLANG_DEPS})
+endif()
 
 set_target_properties(JsMaterialXCore
     PROPERTIES
@@ -152,7 +158,10 @@ if (MATERIALX_BUILD_GEN_MDL)
 endif()
 if (MATERIALX_BUILD_GEN_MSL)
     target_link_libraries(JsMaterialXGenShader PUBLIC MaterialXGenMsl)
-endif()    
+endif()
+if (MATERIALX_BUILD_GEN_SLANG)
+    target_link_libraries(JsMaterialXGenShader PUBLIC MaterialXGenSlang)
+endif()
 
 # Install the JavaScript output
 install(TARGETS JsMaterialXCore DESTINATION "JavaScript/MaterialX")

source/JsMaterialX/JsMaterialXGenSlang/JsSlangShaderGenerator.cpp

@@ -0,0 +1,27 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include <MaterialXGenSlang/SlangShaderGenerator.h>
+#include <MaterialXGenShader/Util.h>
+
+#include <emscripten/bind.h>
+
+namespace ems = emscripten;
+namespace mx = MaterialX;
+
+namespace
+{
+    // Creator wrapper to avoid having to expose the TypeSystem class in JavaScript
+    mx::ShaderGeneratorPtr SlangShaderGenerator_create()
+    {
+        return mx::SlangShaderGenerator::create();
+    }
+}
+
+EMSCRIPTEN_BINDINGS(SlangShaderGenerator)
+{
+    ems::class_<mx::SlangShaderGenerator, ems::base<mx::HwShaderGenerator>>("SlangShaderGenerator")
+        .class_function("create", &SlangShaderGenerator_create);
+}

source/MaterialXFormat/File.cpp

@@ -185,7 +185,7 @@ FilePathVec FilePath::getFilesInDirectory(const string& extension) const
 
 #if defined(_WIN32)
     WIN32_FIND_DATAA fd;
-    FilePath query = extension.empty() ? *this : (*this / ("*." + extension));
+    FilePath query = extension.empty() ? (*this / "*") : (*this / ("*." + extension));
     HANDLE hFind = FindFirstFileA(query.asString().c_str(), &fd);
     if (hFind != INVALID_HANDLE_VALUE)
     {

source/MaterialXGenOsl/CMakeLists.txt

@@ -1,17 +1,7 @@
-file(GLOB_RECURSE materialx_source
- "${CMAKE_CURRENT_SOURCE_DIR}/OslShaderGenerator.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslSyntax.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkShaderGenerator.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkSyntax.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.cpp")
-
-file(GLOB_RECURSE materialx_headers
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslShaderGenerator.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslSyntax.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkShaderGenerator.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkSyntax.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Export.h")
+file(GLOB_RECURSE materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
+
+list(REMOVE_ITEM materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
 
 mx_add_library(MaterialXGenOsl
     SOURCE_FILES
@@ -25,7 +15,7 @@ mx_add_library(MaterialXGenOsl
         MATERIALX_GENOSL_EXPORTS)
 
 # FIXME: LibsToOso has a dependency on the OslRenderer.
-if (MATERIALX_BUILD_RENDER)
+if (MATERIALX_BUILD_OSOS AND MATERIALX_BUILD_RENDER)
     file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
 
     set(MATERIALX_LIBRARIES

source/MaterialXGenOsl/LibsToOso.cpp

@@ -335,7 +335,7 @@ int main(int argc, char* const argv[])
     mx::NodeGraphPtr librariesDocGraph = librariesDoc->addNodeGraph("librariesDocGraph");
 
     // Loop over all the `NodeDef` gathered in our documents from the provided libraries.
-    for (const mx::NodeDefPtr& nodeDef : librariesDoc->getNodeDefs())
+    for (mx::NodeDefPtr nodeDef : librariesDoc->getNodeDefs())
     {
         std::string nodeName = nodeDef->getName();
 
@@ -364,7 +364,7 @@ int main(int argc, char* const argv[])
         }
 
         // TODO: Check for the existence/validity of the `Node`?
-        mx::NodePtr node = librariesDoc->addNodeInstance(nodeDef, nodeName);
+        mx::NodePtr node = librariesDocGraph->addNodeInstance(nodeDef, nodeName);
 
         std::string oslShaderName = node->getName();
         oslShaderGen->getSyntax().makeValidName(oslShaderName);

source/MaterialXGraphEditor/Main.cpp

@@ -202,6 +202,13 @@ int main(int argc, char* const argv[])
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
 #endif
 
+    // When captureFilename is specified, make window invisible
+    // to avoid issues with headless rendering.
+    if (!captureFilename.empty())
+    {
+        glfwWindowHint(GLFW_VISIBLE, GL_FALSE);
+    }
+
     // Create window with graphics context
     GLFWwindow* window = glfwCreateWindow(1280, 960, "MaterialX Graph Editor", NULL, NULL);
     if (!window)

source/MaterialXRenderOsl/OslRenderer.cpp

@@ -28,6 +28,7 @@ OslRendererPtr OslRenderer::create(unsigned int width, unsigned int height, Imag
 OslRenderer::OslRenderer(unsigned int width, unsigned int height, Image::BaseType baseType) :
     ShaderRenderer(width, height, baseType),
     _useTestRender(true),
+    _useOSLCmdStr(false),
     _raysPerPixelLit(1),
     _raysPerPixelUnlit(1)
 {