Fixed Linux build issues

autodesk-forks · Oct 24, 2024 · 90eec49 · 90eec49
1 parent f54c6d0
commit 90eec49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/libraries/pbrlib/genmsl/mx39_pbrlib_genmsl_impl.mtlx b/libraries/pbrlib/genmsl/mx39_pbrlib_genmsl_impl.mtlx
@@ -2,15 +2,15 @@
 <materialx version="1.38">
 
   <!-- <compensating_oren_nayar_diffuse_bsdf> -->
-  <implementation name="IM_compensating_oren_nayar_diffuse_bsdf_genglsl" nodedef="ND_compensating_oren_nayar_diffuse_bsdf" file="../genglsl/mx39_compensating_oren_nayar_diffuse_bsdf.glsl" function="mx39_compensating_oren_nayar_diffuse_bsdf" target="genmsl" />
+  <implementation name="IM_compensating_oren_nayar_diffuse_bsdf_genmsl" nodedef="ND_compensating_oren_nayar_diffuse_bsdf" file="../genglsl/mx39_compensating_oren_nayar_diffuse_bsdf.glsl" function="mx39_compensating_oren_nayar_diffuse_bsdf" target="genmsl" />
 
   <!-- <dielectric_tf_bsdf> -->
-  <implementation name="IM_dielectric_tf_bsdf_genglsl" nodedef="ND_dielectric_tf_bsdf" file="mx39_dielectric_tf_bsdf.glsl" function="../genglsl/mx39_dielectric_tf_bsdf" target="genmsl" />
+  <implementation name="IM_dielectric_tf_bsdf_genmsl" nodedef="ND_dielectric_tf_bsdf" file="../genglsl/mx39_dielectric_tf_bsdf.glsl" function="../genglsl/mx39_dielectric_tf_bsdf" target="genmsl" />
 
   <!-- <generalized_schlick_tf_82_bsdf> -->
-  <implementation name="IM_generalized_schlick_tf_82_bsdf_genglsl" nodedef="ND_generalized_schlick_tf_82_bsdf" file="../genglsl/mx39_generalized_schlick_tf_82_bsdf.glsl" function="mx39_generalized_schlick_tf_82_bsdf" target="genmsl" />
+  <implementation name="IM_generalized_schlick_tf_82_bsdf_genmsl" nodedef="ND_generalized_schlick_tf_82_bsdf" file="../genglsl/mx39_generalized_schlick_tf_82_bsdf.glsl" function="mx39_generalized_schlick_tf_82_bsdf" target="genmsl" />
 
   <!-- <sheen_zeltner_bsdf> -->
-  <implementation name="IM_sheen_zeltner_bsdf_genglsl" nodedef="ND_sheen_zeltner_bsdf" file="../genglsl/mx39_sheen_zeltner_bsdf.glsl" function="mx39_sheen_zeltner_bsdf" target="genmsl" />
+  <implementation name="IM_sheen_zeltner_bsdf_genmsl" nodedef="ND_sheen_zeltner_bsdf" file="../genglsl/mx39_sheen_zeltner_bsdf.glsl" function="mx39_sheen_zeltner_bsdf" target="genmsl" />
 
 </materialx>
diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp
@@ -59,11 +59,6 @@ bool getShaderSource(mx::GenContext& context,
         mx::FilePath resolvedPath = context.resolveSourceFile(sourcePath, localPath);
         sourceContents = mx::readFile(resolvedPath);
         resolvedSource = resolvedPath.asString();
-        if (sourcePath.asString().find("mx39_") != std::string::npos) {
-            std::cerr << "Resolving: " << sourcePath.asString() << std::endl;
-            std::cerr << "localPath: " << localPath.asString() << std::endl;
-            std::cerr << "resolvedPath: " << resolvedPath.asString() << std::endl;
-        }
         return !sourceContents.empty();
     }
     return false;