Merge branch 'AcademySoftwareFoundation:main' into functional_nodedefs

Author: kwokcb

.github/workflows/main.yml

@@ -309,15 +309,15 @@ jobs:
       run: |
         git clone https://github.com/emscripten-core/emsdk --recursive
         cd emsdk
-        ./emsdk install 2.0.20
-        ./emsdk activate 2.0.20
+        ./emsdk install 4.0.8
+        ./emsdk activate 4.0.8
         source ./emsdk_env.sh
         echo "EMSDK=$EMSDK" >> $GITHUB_ENV
 
     - name: Install Node
       uses: actions/setup-node@v4
       with:
-         node-version: '16'
+         node-version: '22.16.0'
 
     - name: JavaScript CMake Generate
       run: cmake -S . -B javascript/build -DMATERIALX_BUILD_JS=ON -DMATERIALX_EMSDK_PATH=${{ env.EMSDK }}

CMakeLists.txt

@@ -287,7 +287,7 @@ if(MSVC)
         add_compile_options(/WX)
     endif()
 else()
-    add_compile_options(-Wall -Wno-missing-braces)
+    add_compile_options(-Wall -Wunused-parameter -Wno-missing-braces)
     if(MATERIALX_WARNINGS_AS_ERRORS)
         add_compile_options(-Werror)
     endif()
@@ -301,7 +301,12 @@ else()
         add_link_options(${DYNAMIC_ANALYSIS_OPTIONS})
     endif()
     if(MATERIALX_BUILD_JS)
-        add_compile_options(-fexceptions)
+        if (CMAKE_BUILD_TYPE MATCHES Debug)
+            add_compile_options(-fexceptions)
+        else()
+            add_compile_options(-fexceptions -Os -flto)
+            add_link_options(-flto)
+        endif()
     endif()
 endif()
 
@@ -450,6 +455,10 @@ add_subdirectory(source/MaterialXFormat)
 # Add shader generation subdirectories
 add_subdirectory(source/MaterialXGenShader)
 if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
+    if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_MSL)
+        add_subdirectory(source/MaterialXGenHw)
+    endif()
+
     if (MATERIALX_BUILD_GEN_GLSL)
         add_definitions(-DMATERIALX_BUILD_GEN_GLSL)
         add_subdirectory(source/MaterialXGenGlsl)

javascript/MaterialXTest/browser/karma.conf.js

@@ -33,5 +33,15 @@ module.exports = function (config)
             'karma-mocha',
             'karma-mocha-reporter',
         ],
+        customLaunchers: {
+            ChromeHeadlessGL: {
+              base: 'Chrome',
+              flags: [
+                '--headless=new',
+                '--enable-gpu',
+                '--enable-webgl',
+              ],
+            },
+        },
     });
 };

javascript/MaterialXTest/browser/shaderGenerator.spec.js

@@ -12,6 +12,10 @@ function createStandardSurfaceMaterial(mx)
     shaderElement.setType('surfaceshader');
     shaderElement.setNodeName(ssName);
     expect(doc.validate()).to.be.true;
+    // Release local wrappers
+    shaderElement.delete();
+    smNode.delete();
+    ssNode.delete();
     return doc;
 }
 
@@ -94,13 +98,32 @@ describe('Generate Shaders', function ()
                         console.error("--- PIXEL SHADER END ---");
                     }
                     expect(gl.getShaderParameter(glPixelShader, gl.COMPILE_STATUS)).to.equal(true);
+                    // Cleanup GL shaders
+                    gl.deleteShader(glVertexShader);
+                    gl.deleteShader(glPixelShader);
                 }
+                // Cleanup shader wrapper
+                mxShader.delete();
             }
             catch (errPtr)
             {
                 console.error("-------- Failed code generation: ----------------");
-                console.error(mx.getExceptionMessage(errPtr));
+                if (typeof mx.getExceptionMessage === 'function')
+                {
+                    console.error(mx.getExceptionMessage(errPtr));
+                }
+                else
+                {
+                    console.error(errPtr);
+                }
             }
+            // Cleanup per-generator wrappers
+            stdlib.delete();
+            genContext.delete();
+            gen.delete();
         }
+        // Cleanup element and document
+        elem.delete();
+        doc.delete();
     });
 });

javascript/MaterialXTest/codeExamples.spec.js

@@ -76,6 +76,12 @@ describe('Code Examples', () =>
 
         // // Validate the value of roughness in the context of this material.
         // expect(roughness.getBoundValue(material).getValueString()).to.equal('0.5');
+        // Cleanup wrappers
+        nodeDefs.forEach(nd => nd.delete());
+        output.delete();
+        image.delete();
+        nodeGraph.delete();
+        doc.delete();
     });
 
     it('Traversing a Document Tree', async () =>
@@ -101,6 +107,7 @@ describe('Code Examples', () =>
             }
         }
         expect(imageCount).to.greaterThan(0);
+        doc.delete();
     });
 
     it('Building a MaterialX Document', async () =>
@@ -133,5 +140,6 @@ describe('Code Examples', () =>
 
         // expect(materialCount).to.equal(0);
         // expect(shaderInputCount).to.equal(0);
+        doc.delete();
     });
 });

javascript/MaterialXTest/customBindings.spec.js

@@ -30,14 +30,20 @@ describe('Custom Bindings', () =>
 
         // Omitting non-optional parameter should throw
         expect(() => { nodeGraph.addNode(); }).to.throw;
+
+        // Cleanup
+        node.delete();
+        nodeGraph2.delete();
+        nodeGraph.delete();
+        doc.delete();
     });
 
     it('Vector <-> Array conversion', () =>
     {
         // Functions that return vectors in C++ should return an array in JS
         const doc = mx.createDocument();
         const nodeGraph = doc.addNodeGraph();
-        doc.addNodeGraph();
+        const nodeGraphB = doc.addNodeGraph();
         const nodeGraphs = doc.getNodeGraphs();
         expect(nodeGraphs).to.be.an.instanceof(Array);
         expect(nodeGraphs.length).to.equal(2);
@@ -68,6 +74,16 @@ describe('Custom Bindings', () =>
         expect(nodes[0].getName()).to.equal('node1'); // Name auto-constructed from category
         expect(nodes[1].getName()).to.equal('node2'); // Name auto-constructed from category
         expect(nodes[2].getName()).to.equal('anotherNode'); // Name set explicitly at creation time
+
+        // Cleanup created wrappers
+        nodes.forEach(n => n.delete());
+        backdrop.delete();
+        node3.delete();
+        node2.delete();
+        node1.delete();
+        nodeGraphB.delete();
+        nodeGraph.delete();
+        doc.delete();
     });
 
     it('C++ exception handling', () =>
@@ -81,17 +97,20 @@ describe('Custom Bindings', () =>
         expect(nodeGraph1.hasInheritanceCycle()).to.not.throw;
         expect(nodeGraph1.hasInheritanceCycle()).to.be.true;
 
-        // Exceptions that are not caught in C++ should throw with an exception pointer
+        // Exceptions that are not caught in C++ should throw
         nodeGraph1.addNode('node', 'node1');
         expect(() => { nodeGraph1.addNode('node', 'node1'); }).to.throw;
         try
         {
             nodeGraph1.addNode('node', 'node1');
-        } catch (errPtr)
+        } catch (err)
         {
-            expect(errPtr).to.be.a('number');
-            expect(mx.getExceptionMessage(errPtr)).to.be.a('string');
+            expect(mx.getExceptionMessage(err)).to.be.a('string');
         }
+        // Cleanup
+        nodeGraph2.delete();
+        nodeGraph1.delete();
+        doc.delete();
     });
 
     it('getReferencedSourceUris', async () =>
@@ -104,6 +123,7 @@ describe('Custom Bindings', () =>
         expect(sourceUris.length).to.equal(3);
         expect(sourceUris[0]).to.be.a('string');
         expect(sourceUris.includes('standard_surface_brass_tiled.mtlx')).to.be.true;
+        doc.delete();
     });
 
     it('Should invoke correct instance of \'validate\'', () =>
@@ -133,6 +153,11 @@ describe('Custom Bindings', () =>
         expect(token.validate()).to.be.false;
         expect(token.validate(message)).to.be.false;
         expect(message.message).to.include('Unit type definition does not exist in document')
+
+        // Cleanup
+        token.delete();
+        node.delete();
+        doc.delete();
     });
 
     it('StringResolver name substitution getters', () =>
@@ -164,6 +189,7 @@ describe('Custom Bindings', () =>
         expect(gnSubs).to.be.instanceof(Object);
         expect(Object.keys(gnSubs).length).to.equal(2);
         expect(gnSubs).to.deep.equal(gnTestData);
+        resolver.delete();
     });
 
     it('getShaderNodes', async () =>
@@ -184,6 +210,11 @@ describe('Custom Bindings', () =>
         shaderNodes = mx.getShaderNodes(matNode, mx.DISPLACEMENT_SHADER_TYPE_STRING);
         expect(shaderNodes).to.be.instanceof(Array);
         expect(shaderNodes.length).to.equal(0);
+
+        // Cleanup wrappers
+        shaderNodes.forEach(s => s.delete());
+        matNodes.forEach(n => n.delete());
+        doc.delete();
     });
 
     it('createValidName', () =>
@@ -211,6 +242,7 @@ describe('Custom Bindings', () =>
         expect(docVersion).to.be.instanceof(Array);
         expect(docVersion.length).to.equal(2);
         expect(docVersion).to.deep.equal(versionStringArr);
+        doc.delete();
 
         // InterfaceElement.getVersionIntegers (via NodeDef)
         // TODO: This function can currently not be called, since we have a linker issue that messes up this function.

javascript/MaterialXTest/document.spec.js

@@ -162,5 +162,27 @@ describe('Document', () =>
         output2.setConnectedNode(null);
         expect(output1.getConnectedNode()).to.equal(null);
         expect(output2.getConnectedNode()).to.equal(null);
+        // Cleanup created wrappers
+        propertySetAssign.delete();
+        propertySet.delete();
+        propertyAssign.delete();
+        variantSet.delete();
+        collection.delete();
+        matAssign2.delete();
+        matAssign1.delete();
+        look.delete();
+        instanceRoughness.delete();
+        shaderNode.delete();
+        materialNode.delete();
+        simpleSrf.delete();
+        output2.delete();
+        output1.delete();
+        custom.delete();
+        color.delete();
+        image.delete();
+        constant.delete();
+        nodeDef.delete();
+        nodeGraph.delete();
+        doc.delete();
     });
 });

javascript/MaterialXTest/element.spec.js

@@ -31,6 +31,13 @@ describe('Element', () =>
         };
     });
 
+    after(() =>
+    {
+        // Cleanup typed helper objects and document
+        Object.values(valueTypes).forEach(v => v.delete());
+        doc.delete();
+    });
+
     describe('value setters', () =>
     {
         const checkValue = (types, assertionCallback) =>
@@ -42,6 +49,7 @@ describe('Element', () =>
                 elem[setFn](types[typeName]);
                 assertionCallback(elem.getValue().getData(), typeName);
             });
+            elem.delete();
         };
 
         it('should work with expected type', () =>
@@ -80,6 +88,7 @@ describe('Element', () =>
                 elem[setFn](typeName, types[typeName]);
                 assertionCallback(elem[getFn](typeName), types[typeName]);
             });
+            elem.delete();
         };
 
         it('should work with expected custom type', () =>
@@ -162,6 +171,7 @@ describe('Element', () =>
             expect(doc[specializedFn]()).to.be.an.instanceof(specialElemType[typeName]);
             expect(doc.addChildOfCategory(factoryName)).to.be.an.instanceof(specialElemType[typeName]);
         });
+        // No doc.delete() here; cleaned up in after()
     });
 });