From bbb34a0eae50bb456d70f25f5f27c57f6d403a65 Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Fri, 24 Jan 2025 15:56:10 -0800
Subject: [PATCH] Inline OSL closure layer nodes (#2194)

Building upon recent work in https://github.com/AcademySoftwareFoundation/MaterialX/pull/2191, this changelist simplifies the OSL implementations of the closure layer nodes by defining them as inline source code.
---
 libraries/pbrlib/genosl/mx_layer_bsdf.osl       | 4 ----
 libraries/pbrlib/genosl/mx_layer_vdf.osl        | 4 ----
 libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx | 4 ++--
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 libraries/pbrlib/genosl/mx_layer_bsdf.osl
 delete mode 100644 libraries/pbrlib/genosl/mx_layer_vdf.osl

diff --git a/libraries/pbrlib/genosl/mx_layer_bsdf.osl b/libraries/pbrlib/genosl/mx_layer_bsdf.osl
deleted file mode 100644
index 8310207cb0..0000000000
--- a/libraries/pbrlib/genosl/mx_layer_bsdf.osl
+++ /dev/null
@@ -1,4 +0,0 @@
-void mx_layer_bsdf(BSDF top, BSDF base, output BSDF result)
-{
-    result = layer(top, base);
-}
diff --git a/libraries/pbrlib/genosl/mx_layer_vdf.osl b/libraries/pbrlib/genosl/mx_layer_vdf.osl
deleted file mode 100644
index e93fe85aa7..0000000000
--- a/libraries/pbrlib/genosl/mx_layer_vdf.osl
+++ /dev/null
@@ -1,4 +0,0 @@
-void mx_layer_vdf(BSDF top, VDF base, output BSDF result)
-{
-    result = layer(top, base);
-}
diff --git a/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx b/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx
index ea4a45da69..823f57d816 100644
--- a/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx
+++ b/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx
@@ -38,8 +38,8 @@
   <implementation name="IM_generalized_schlick_edf_genosl" nodedef="ND_generalized_schlick_edf" file="mx_generalized_schlick_edf.osl" function="mx_generalized_schlick_edf" target="genosl" />
 
   <!-- <layer> -->
-  <implementation name="IM_layer_bsdf_genosl" nodedef="ND_layer_bsdf" file="mx_layer_bsdf.osl" function="mx_layer_bsdf" target="genosl" />
-  <implementation name="IM_layer_vdf_genosl" nodedef="ND_layer_vdf" file="mx_layer_vdf.osl" function="mx_layer_vdf" target="genosl" />
+  <implementation name="IM_layer_bsdf_genosl" nodedef="ND_layer_bsdf" sourcecode="layer({{top}}, {{base}})" target="genosl" />
+  <implementation name="IM_layer_vdf_genosl" nodedef="ND_layer_vdf" sourcecode="layer({{top}}, {{base}})" target="genosl" />
 
   <!-- <mix> -->
   <implementation name="IM_mix_bsdf_genosl" nodedef="ND_mix_bsdf" sourcecode="mix({{bg}}, {{fg}}, {{mix}})" target="genosl" />