Inline OSL closure layer nodes (#2194)

Building upon recent work in #2191, this changelist simplifies the OSL implementations of the closure layer nodes by defining them as inline source code.
AcademySoftwareFoundation · Jan 24, 2025 · bbb34a0 · bbb34a0
1 parent f230ecd
commit bbb34a0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/libraries/pbrlib/genosl/mx_layer_bsdf.osl b/libraries/pbrlib/genosl/mx_layer_bsdf.osl
diff --git a/libraries/pbrlib/genosl/mx_layer_vdf.osl b/libraries/pbrlib/genosl/mx_layer_vdf.osl
diff --git 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" />