Skip to content

Update submodule to head (1.39.4) #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kwokcb merged 1 commit into from
Aug 25, 2025
Merged

Update submodule to head (1.39.4) #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if (APPLE)
set(CMAKE_OSX_ARCHITECTURES "x86_64")
endif()

option(MATERIALX_EXTERNAL "Build aginst an external install of Materialx (MATERIALX_ROOT may also need to be set)" OFF)
option(MATERIALX_EXTERNAL "Build against an external install of Materialx (MATERIALX_ROOT may also need to be set)" OFF)
if (MATERIALX_EXTERNAL)
set(MATERIALX_LIBRARY_NAMES "MaterialXCore;MaterialXFormat;MaterialXRender")
find_path(MATERIALX_INCLUDE_DIRS
Expand Down
2 changes: 1 addition & 1 deletion MaterialX
Open in desktop
Submodule MaterialX updated 91 files
+44 −17 .github/workflows/main.yml
+2 −0 CHANGELOG.md
+7 −1 CMakeLists.txt
+4 −4 README.md
+1 −1 documents/DeveloperGuide/MainPage.md
+63 −72 documents/DeveloperGuide/ShaderGeneration.md
+21 −21 documents/Specification/MaterialX.GeomExts.md
+66 −66 documents/Specification/MaterialX.Specification.md
+1 −1 documents/Specification/MaterialX.Supplement.md
+6 −2 libraries/bxdf/standard_surface.mtlx
+0 −25 libraries/stdlib/genglsl/mx_overlay.glsl
+0 −6 libraries/stdlib/genglsl/mx_overlay_color3.glsl
+0 −6 libraries/stdlib/genglsl/mx_overlay_color4.glsl
+0 −5 libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+0 −5 libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+0 −5 libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+1 −2 libraries/stdlib/genosl/mx_image_color3.osl
+1 −1 libraries/stdlib/genosl/mx_image_color4.osl
+0 −16 libraries/stdlib/genosl/mx_overlay_color3.osl
+0 −22 libraries/stdlib/genosl/mx_overlay_color4.osl
+0 −5 libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+2 −2 libraries/stdlib/stdlib_defs.mtlx
+112 −0 libraries/stdlib/stdlib_ng.mtlx
+0 −3 resources/Materials/TestSuite/_options.mtlx
+6 −6 resources/Materials/TestSuite/stdlib/compositing/compositing.mtlx
+25 −0 resources/Materials/TestSuite/stdlib/texture/texcoord.mtlx
+0 −40 resources/Materials/TestSuite/stdlib/upgrade/1_37_to_1_38.mtlx
+0 −71 resources/Materials/TestSuite/stdlib/upgrade/1_38_parameter_to_input.mtlx
+0 −22 resources/Materials/TestSuite/stdlib/upgrade/material_element_to_surface_material.mtlx
+70 −0 resources/Materials/TestSuite/stdlib/upgrade/syntax_1_22.mtlx
+28 −0 resources/Materials/TestSuite/stdlib/upgrade/syntax_1_25.mtlx
+1 −3 resources/Materials/TestSuite/stdlib/upgrade/syntax_1_36.mtlx
+113 −0 resources/Materials/TestSuite/stdlib/upgrade/syntax_1_37.mtlx
+55 −125 source/MaterialXCore/Document.cpp
+1 −10 source/MaterialXCore/Geom.h
+3 −3 source/MaterialXCore/Util.cpp
+4 −1 source/MaterialXCore/Value.cpp
+1 −1 source/MaterialXCore/Value.h
+8 −17 source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+1 −6 source/MaterialXGenGlsl/GlslShaderGenerator.h
+5 −0 source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
+2 −0 source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
+0 −62 source/MaterialXGenGlsl/Nodes/TexCoordNodeGlsl.cpp
+0 −43 source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.cpp
+0 −27 source/MaterialXGenGlsl/Nodes/TransformNormalNodeGlsl.h
+0 −23 source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.cpp
+0 −25 source/MaterialXGenGlsl/Nodes/TransformPointNodeGlsl.h
+0 −84 source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.cpp
+0 −30 source/MaterialXGenGlsl/Nodes/TransformVectorNodeGlsl.h
+3 −0 source/MaterialXGenMdl/MdlShaderGenerator.cpp
+0 −60 source/MaterialXGenMdl/mdl/materialx/stdlib.mdl
+8 −17 source/MaterialXGenMsl/MslShaderGenerator.cpp
+1 −6 source/MaterialXGenMsl/MslShaderGenerator.h
+5 −0 source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
+2 −0 source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
+0 −62 source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.cpp
+0 −26 source/MaterialXGenMsl/Nodes/TexCoordNodeMsl.h
+0 −43 source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.cpp
+0 −27 source/MaterialXGenMsl/Nodes/TransformNormalNodeMsl.h
+0 −23 source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.cpp
+0 −25 source/MaterialXGenMsl/Nodes/TransformPointNodeMsl.h
+0 −84 source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.cpp
+0 −30 source/MaterialXGenMsl/Nodes/TransformVectorNodeMsl.h
+130 −89 source/MaterialXGenOsl/OslShaderGenerator.cpp
+3 −3 source/MaterialXGenOsl/OslShaderGenerator.h
+0 −1 source/MaterialXGenOsl/OslSyntax.cpp
+3 −0 source/MaterialXGenShader/HwShaderGenerator.h
+83 −0 source/MaterialXGenShader/Nodes/HwTexCoordNode.cpp
+10 −5 source/MaterialXGenShader/Nodes/HwTexCoordNode.h
+110 −0 source/MaterialXGenShader/Nodes/HwTransformNode.cpp
+71 −0 source/MaterialXGenShader/Nodes/HwTransformNode.h
+5 −0 source/MaterialXGenShader/ShaderNode.cpp
+3 −0 source/MaterialXGenShader/ShaderNode.h
+16 −1 source/MaterialXGenShader/ShaderStage.cpp
+18 −8 source/MaterialXGenShader/ShaderStage.h
+1 −1 source/MaterialXGraphEditor/External/Glfw/CMakeLists.txt
+309 −219 source/MaterialXGraphEditor/Graph.cpp
+30 −3 source/MaterialXGraphEditor/Graph.h
+7 −44 source/MaterialXGraphEditor/Main.cpp
+0 −20 source/MaterialXGraphEditor/RenderView.cpp
+23 −0 source/MaterialXGraphEditor/UiNode.h
+3 −0 source/MaterialXRender/ImageHandler.h
+0 −105 source/MaterialXTest/MaterialXCore/Document.cpp
+15 −0 source/MaterialXTest/MaterialXCore/Geom.cpp
+2 −0 source/MaterialXTest/MaterialXCore/Look.cpp
+0 −21 source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
+3 −5 source/MaterialXTest/MaterialXGenShader/GenShaderUtil.h
+0 −21 source/MaterialXTest/MaterialXRender/RenderUtil.cpp
+0 −6 source/MaterialXTest/MaterialXRender/RenderUtil.h
+1 −21 source/MaterialXView/Viewer.cpp
+1 −0 source/PyMaterialX/PyMaterialXGenShader/PyShaderPort.cpp
Loading
Loading
⚡