Sync for 1.37.2 (#741)

* Update document version strings - Update document version strings to 1.37. - Remove legacy attributes from root elements. * Extend build tests to Clang 9 Extend Travis build tests to Clang 9, and fix a related warning in MaterialXRenderGlsl. * Update CMake policy for broader compatibility This changelist updates the CMake policy for OpenGL library preferences, requesting that older libraries be used when both new and old are present in the same environment. This addresses an issue brought up by Frankie Liu at Nvidia on the MaterialX discussion forum. Co-authored-by: Jonathan Stone <[email protected]>
autodesk-forks · Feb 1, 2020 · 47fe0c5 · 47fe0c5
1 parent 57dbcdf
commit 47fe0c5
Show file tree

Hide file tree

Showing 124 changed files with 146 additions and 136 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -11,17 +11,17 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: Visual Studio 15 2017
       ARCH: Win32
-      PYTHON: C:\Python36
+      PYTHON: C:\Python37
       GENERATOR_NAME: vs2017
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: Visual Studio 16 2019
       ARCH: x64
-      PYTHON: C:\Python37-x64
+      PYTHON: C:\Python38-x64
       GENERATOR_NAME: vs2019
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: Visual Studio 15 2017
       ARCH: x64
-      PYTHON: C:\Python36-x64
+      PYTHON: C:\Python37-x64
       GENERATOR_NAME: vs2017
 
 configuration:

diff --git a/.travis.yml b/.travis.yml
@@ -2,20 +2,15 @@ language: cpp
 
 addons:
   apt:
-    sources:
-      - llvm-toolchain-xenial-8
-      - ubuntu-toolchain-r-test
-    packages:
+    packages: &packages_base
       - libglu1-mesa-dev
       - libxxf86vm-dev
       - libxrandr-dev
       - libxinerama-dev
       - libxcursor-dev
       - libxi-dev
       - libx11-dev
-      - g++-6
-      - g++-9
-      - clang-8
+    packages: *packages_base
 
 matrix:
   include:
@@ -52,14 +47,25 @@ matrix:
       dist: xenial
       compiler: gcc
       env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: [*packages_base, g++-6]
     - os: linux
       dist: xenial
       compiler: gcc
       env: MATRIX_EVAL="CC=gcc-9 && CXX=g++-9 && PY=3"
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: [*packages_base, g++-9]
     - os: linux
-      dist: xenial
+      dist: bionic
       compiler: clang
-      env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8 && PY=3"
+      env: MATRIX_EVAL="CC=clang-9 && CXX=clang++-9 && PY=3"
+      addons:
+        apt:
+          packages: [*packages_base, clang-9]
 
 before_install:
   - export PY=2

diff --git a/libraries/bxdf/disney_brdf_2012.mtlx b/libraries/bxdf/disney_brdf_2012.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709">
+<materialx version="1.37" colorspace="lin_rec709">
   <nodedef name="ND_disney_brdf_2012_surface" node="disney_brdf_2012">
     <input name="baseColor" type="color3" value="0.16, 0.16, 0.16"/>
     <input name="metallic" type="float" value="0"/>

diff --git a/libraries/bxdf/disney_brdf_2015.mtlx b/libraries/bxdf/disney_brdf_2015.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709">
+<materialx version="1.37" colorspace="lin_rec709">
   <nodedef name="ND_disney_bsdf_2015_surface" node="disney_bsdf_2015">
     <input name="baseColor" type="color3" value="0.16, 0.16, 0.16"/>
     <input name="metallic" type="float" value="0"/>

diff --git a/libraries/bxdf/standard_surface.mtlx b/libraries/bxdf/standard_surface.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <!--
     Autodesk Standard Surface node definition.
   -->

diff --git a/libraries/bxdf/usd_preview_surface.mtlx b/libraries/bxdf/usd_preview_surface.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- USD Preview Surface node definitions                                     -->

diff --git a/libraries/lights/genglsl/lights_genglsl_impl.mtlx b/libraries/lights/genglsl/lights_genglsl_impl.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- <point_light> -->
   <implementation name="IM_point_light_genglsl" nodedef="ND_point_light" file="lights/genglsl/mx_point_light.glsl" function="mx_point_light" language="genglsl"/>

diff --git a/libraries/lights/lights_defs.mtlx b/libraries/lights/lights_defs.mtlx
@@ -10,7 +10,7 @@
   may change in future revisions.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Light shader nodes                                                       -->

diff --git a/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx b/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- <diffuse_brdf> -->
   <implementation name="IM_diffuse_brdf_genglsl" nodedef="ND_diffuse_brdf" file="pbrlib/genglsl/mx_diffuse_brdf.glsl" function="mx_diffuse_brdf" language="genglsl"/>

diff --git a/libraries/pbrlib/pbrlib_defs.mtlx b/libraries/pbrlib/pbrlib_defs.mtlx
@@ -6,7 +6,7 @@
   Declarations of standard data types and nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Data Types                                                               -->

diff --git a/libraries/pbrlib/pbrlib_ng.mtlx b/libraries/pbrlib/pbrlib_ng.mtlx
@@ -7,7 +7,7 @@
   Declarations of standard data types and nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
   <!-- <glossiness_anisotropy> -->
   <nodegraph name="IMP_glossiness_anisotropy" nodedef="ND_glossiness_anisotropy">
     <invert name="invert1" type="float">

diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Color Management System Implementations -->

diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -6,7 +6,7 @@
   Declarations for glsl implementations of standard nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Texture nodes                                                            -->

diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_unit_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_unit_impl.mtlx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Unit System Implementations -->

diff --git a/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Color Management System Implementations -->

diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -6,7 +6,7 @@
   Declarations for OSL implementations of standard nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Texture nodes                                                            -->

diff --git a/libraries/stdlib/genosl/stdlib_genosl_unit_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_unit_impl.mtlx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Unit System Implementations -->

diff --git a/libraries/stdlib/osl/stdlib_osl_impl.mtlx b/libraries/stdlib/osl/stdlib_osl_impl.mtlx
@@ -6,7 +6,7 @@
   Declarations for OSL implementations of standard nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Texture nodes                                                            -->

diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
@@ -6,7 +6,7 @@
   Nodegraph implementations for Supplemental Nodes included in the MaterialX specification.
 -->
 
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- ======================================================================== -->
   <!-- Supplemental Texture nodes                                               -->

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_brass_tiled.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_brass_tiled.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" cms="ocio">
+<materialx version="1.37">
   <nodegraph name="NG_brass1" colorspace="srgb_texture" fileprefix="resources/Images/">
     <tiledimage name="image_color" type="color3">
       <parameter name="file" type="filename" value="brass_color.jpg" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_carpaint.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_carpaint.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Car_Paint">
     <shaderref name="SR_carpaint" node="standard_surface">
       <bindinput name="base" type="float" value="0.5" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_chrome.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_chrome.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Chrome">
     <shaderref name="SR_chrome" node="standard_surface">
       <bindinput name="base" type="float" value="1" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_copper.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_copper.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Copper">
     <shaderref name="SR_copper" node="standard_surface">
       <bindinput name="base" type="float" value="1" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_default.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_default.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Default">
     <shaderref name="SR_default" node="standard_surface">
       <bindinput name="base" type="float" value="0.8"/>

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_emission.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_emission.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <nodegraph name="NG_marble1">
     <position name="objpos" type="vector3" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_glass.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_glass.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Glass">
     <shaderref name="SR_glass" node="standard_surface">
       <bindinput name="base" type="float" value="0.0"/>

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_gold.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_gold.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Gold">
     <shaderref name="SR_gold" node="standard_surface">
       <bindinput name="base" type="float" value="1" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" colorspace="lin_rec709">
+<materialx version="1.37" colorspace="lin_rec709">
   <material name="Greysphere">
     <shaderref name="SR_greysphere" node="standard_surface">
       <bindinput name="base" type="float" value="1.0"/>

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" colorspace="srgb_texture" fileprefix="resources/Images/">
+<materialx version="1.37" colorspace="srgb_texture" fileprefix="resources/Images/">
   <nodegraph name="NG_Greysphere_Calibration">
     <texcoord name="texcoord1" type="vector2" />
     <place2d name="place2d" type="vector2">

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_jade.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_jade.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Jade">
     <shaderref name="SR_jade" node="standard_surface">
       <bindinput name="base" type="float" value="0.5" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_look_brass_tiled.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_look_brass_tiled.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" xmlns:xi="http://www.w3.org/2001/XInclude">
+<materialx version="1.37" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="standard_surface_brass_tiled.mtlx"/>
   <xi:include href="standard_surface_greysphere_calibration.mtlx"/>
   <look name="Brass_Look">

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_look_wood_tiled.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_look_wood_tiled.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" xmlns:xi="http://www.w3.org/2001/XInclude">
+<materialx version="1.37" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="standard_surface_wood_tiled.mtlx"/>
   <xi:include href="standard_surface_greysphere_calibration.mtlx"/>
   <look name="Wood_Look">

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_marble_solid.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_marble_solid.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <nodegraph name="NG_marble1">
     <position name="objpos" type="vector3" />
     <dotproduct name="addxyz" type="float">

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_plastic.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_plastic.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Plastic">
     <shaderref name="SR_plastic" node="standard_surface">
       <bindinput name="base" type="float" value="1" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_sheen.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_sheen.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Default">
     <shaderref name="SR_sheen" node="standard_surface">
       <bindinput name="base" type="float" value="0.172"/>

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_velvet.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_velvet.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <material name="Velvet">
     <shaderref name="SR_velvet" node="standard_surface">
       <bindinput name="base_color" type="color3" value="0.029130585, 0, 0.047337279" />

diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_wood_tiled.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_wood_tiled.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.36" cms="ocio">
+<materialx version="1.37">
   <nodegraph name="NG_wood1" colorspace="srgb_texture" fileprefix="resources/Images/">
     <tiledimage name="image_base_color" type="color3">
       <parameter name="file" type="filename" value="wood_base_color.jpg" />

diff --git a/resources/Materials/Examples/Syntax/CustomNode.mtlx b/resources/Materials/Examples/Syntax/CustomNode.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- Parameter interface for a simple custom node -->
   <!-- The "bg" input is required, while the "fg" input and "fgamt" parameter are optional. -->

diff --git a/resources/Materials/Examples/Syntax/GeomInfos.mtlx b/resources/Materials/Examples/Syntax/GeomInfos.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <collection name="col1" includegeom="/root/world/geo/g[123]"/>
   <collection name="col2" includegeom="/root/world/geo/g[4567]"/>
   <collection name="col3" includegeom="/root/world/geo/g[89]"/>

diff --git a/resources/Materials/Examples/Syntax/Looks.mtlx b/resources/Materials/Examples/Syntax/Looks.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
+<materialx version="1.37" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="SimpleSrf.mtlx"/>
   <material name="Mplastic1">
     <shaderref name="sr_mp1" node="simple_srf">

diff --git a/resources/Materials/Examples/Syntax/MaterialBasic.mtlx b/resources/Materials/Examples/Syntax/MaterialBasic.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <nodedef name="ND_simplesrf_surface" node="simplesrf">
     <input name="diff_albedo" type="color3" value="0.18,0.18,0.18"/>
     <input name="spec_color" type="color3" value="1,1,1"/>

diff --git a/resources/Materials/Examples/Syntax/MultiOutput.mtlx b/resources/Materials/Examples/Syntax/MultiOutput.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
 
   <!-- Declare a multi-output node with an external OSL implementation -->
   <nodedef name="ND_doublecolor_c3c3" node="doublecolor">

diff --git a/resources/Materials/Examples/Syntax/NodeGraphs.mtlx b/resources/Materials/Examples/Syntax/NodeGraphs.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36">
+<materialx version="1.37">
   <!-- "nodegraph1" example from Spec doc -->
   <nodegraph name="NG_example1">
     <image name="img1" type="color3">

diff --git a/resources/Materials/Examples/Syntax/PaintMaterials.mtlx b/resources/Materials/Examples/Syntax/PaintMaterials.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
+<materialx version="1.37" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="SimpleSrf.mtlx"/>
 
   <material name="paint_flat">

diff --git a/resources/Materials/Examples/Syntax/PostShaderComposite.mtlx b/resources/Materials/Examples/Syntax/PostShaderComposite.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
+<materialx version="1.37" cms="ocio" colorspace="lin_rec709" xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="SimpleSrf.mtlx"/>
 
   <!-- Define interface and shading network for "twoLayerSurface" node -->

diff --git a/resources/Materials/Examples/Syntax/PreShaderComposite.mtlx b/resources/Materials/Examples/Syntax/PreShaderComposite.mtlx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<materialx version="1.36" cms="ocio" colorspace="lin_rec709">
+<materialx version="1.37" cms="ocio" colorspace="lin_rec709">
 
   <!-- Define a basic surface shaders with two implementations; first might be
        applicable to several renderers, second is specific to rmanris and has