Enable Trace macros for materialX interface in hdMtlx

PixarAnimationStudios · Sep 8, 2023 · 76de936 · 76de936
1 parent 6988a51
commit 76de936
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pxr/imaging/hdMtlx/hdMtlx.cpp b/pxr/imaging/hdMtlx/hdMtlx.cpp
@@ -36,6 +36,7 @@
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/getenv.h"
 #include "pxr/base/tf/token.h"
+#include "pxr/base/trace/trace.h"
 
 #include "pxr/usd/usdMtlx/utils.h"
 
@@ -520,6 +521,7 @@ HdMtlxCreateMtlxDocumentFromHdMaterialNetworkInterface(
     MaterialX::DocumentPtr const& libraries,
     HdMtlxTexturePrimvarData *mxHdData)
 {
+    TRACE_FUNCTION_SCOPE("Create Mtlx Document from HdMaterialNetwork")
     if (!netInterface) {
         return nullptr;
     }
@@ -550,12 +552,14 @@ HdMtlxCreateMtlxDocumentFromHdMaterialNetworkInterface(
         mxShaderNode);
 
     // Validate the MaterialX Document.
-    std::string message;
-    if (!mxDoc->validate(&message)) {
-        TF_WARN("Validation warnings for generated MaterialX file.\n%s", 
+    {
+	TRACE_FUNCTION_SCOPE("Validate created Mtlx Document")
+        std::string message;
+        if (!mxDoc->validate(&message)) {
+            TF_WARN("Validation warnings for generated MaterialX file.\n%s\n", 
                 message.c_str());
+        }
     }
-
     return mxDoc;
 }
 

diff --git a/pxr/imaging/hdSt/materialXFilter.cpp b/pxr/imaging/hdSt/materialXFilter.cpp
@@ -145,6 +145,7 @@ HdSt_GenMaterialXShader(
     HdSt_MxShaderGenInfo const& mxHdInfo,
     TfToken const& apiName)
 {
+    TRACE_FUNCTION_SCOPE("Create GlslShader from MtlxDocument")
     // Initialize the Context for shaderGen. 
     mx::GenContext mxContext = _CreateHdStMaterialXContext(mxHdInfo, apiName);
 
@@ -765,6 +766,7 @@ _AddMaterialXParams(
     mx::ShaderPtr const& glslfxShader,
     HdSt_MaterialParamVector* materialParams)
 {
+    TRACE_FUNCTION_SCOPE("Collect Mtlx params from glslfx shader.")
     if (!glslfxShader) {
         return;
     }
@@ -957,6 +959,7 @@ HdSt_ApplyMaterialXFilter(
                                                      _tokens->mtlx);
 
     if (mtlxSdrNode) {
+        TRACE_FUNCTION_SCOPE("ApplyMaterialXFilter: Found Mtlx Node.")
 
         mx::ShaderPtr glslfxShader;
         const TfToken materialTagToken(_GetMaterialTag(terminalNode));