projects / platform / core / uifw / OpenUSD.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d14d83 99c21fc)
Merge pull request #2807 from erikaharrison-adsk/adsk/bugfix/namecollisionfix
authorpixar-oss <pixar-oss@users.noreply.github.com>
Fri, 15 Dec 2023 00:33:37 +0000 (16:33 -0800)
committerpixar-oss <pixar-oss@users.noreply.github.com>
Fri, 15 Dec 2023 19:15:56 +0000 (11:15 -0800)
Autodesk: Bugfix - Avoid name collision with MaterialX inputs and built-in uniforms

(Internal change: 2308795)

1  2 
pxr/imaging/hdSt/codeGen.cpp patch | diff1 | diff2 | blob | history
pxr/imaging/hdSt/materialNetwork.cpp patch | diff1 | diff2 | blob | history
pxr/imaging/hdSt/tokens.h patch | diff1 | diff2 | blob | history

diff --cc pxr/imaging/hdSt/codeGen.cpp
index db3329b6257fbe4fd352d85773f7e4ab11aeff79,949969373afc7fdf9c447b7bc2b57218cea9bed0..a8e1455a5f63915655699027688596ba3c83e7d9
--- 1/pxr/imaging/hdSt/codeGen.cpp
--- 2/pxr/imaging/hdSt/codeGen.cpp
+++ b/pxr/imaging/hdSt/codeGen.cpp
@@@ -3462,12 -3433,12 +3462,16 @@@ static void _EmitTextureAccessors
      // Forward declare texture scale and bias
      if (hasTextureScaleAndBias) {
          accessors 
-             << "#ifdef HD_HAS_" << name << "_" << HdStTokens->scale << "\n"
-             << "FORWARD_DECL(vec4 HdGet_" << name << "_" << HdStTokens->scale 
 -            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "\n"
 -            << "FORWARD_DECL(vec4 HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale 
++            << "#ifdef HD_HAS_" << name << "_" 
++            << HdStTokens->storm << "_" << HdStTokens->scale << "\n"
++            << "FORWARD_DECL(vec4 HdGet_" << name << "_" 
++            << HdStTokens->storm << "_" << HdStTokens->scale 
              << "());\n"
              << "#endif\n"
-             << "#ifdef HD_HAS_" << name << "_" << HdStTokens->bias  << "\n"
-             << "FORWARD_DECL(vec4 HdGet_" << name << "_" << HdStTokens->bias 
 -            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias  << "\n"
 -            << "FORWARD_DECL(vec4 HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias 
++            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->storm 
++            << "_" << HdStTokens->bias  << "\n"
++            << "FORWARD_DECL(vec4 HdGet_" << name << "_" << HdStTokens->storm 
++            << "_" << HdStTokens->bias 
              << "());\n"
              << "#endif\n";
      }
@@@ -3624,11 -3595,11 +3628,15 @@@
              }
          }
          accessors
-             << "#ifdef HD_HAS_" << name << "_" << HdStTokens->scale << "\n"
-             << "    * HdGet_" << name << "_" << HdStTokens->scale << "()\n"
 -            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "\n"
 -            << "    * HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "()\n"
++            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->storm << "_" 
++            << HdStTokens->scale << "\n"
++            << "    * HdGet_" << name << "_" << HdStTokens->storm << "_" 
++            << HdStTokens->scale << "()\n"
              << "#endif\n" 
-             << "#ifdef HD_HAS_" << name << "_" << HdStTokens->bias << "\n"
-             << "    + HdGet_" << name << "_" << HdStTokens->bias  << "()\n"
 -            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias << "\n"
 -            << "    + HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias  << "()\n"
++            << "#ifdef HD_HAS_" << name << "_" << HdStTokens->storm << "_" 
++            << HdStTokens->bias << "\n"
++            << "    + HdGet_" << name << "_" << HdStTokens->storm << "_" 
++            << HdStTokens->bias  << "()\n"
              << "#endif\n"
              << ")" << swizzle << ");\n";
      } else {
@@@ -3684,12 -3655,12 +3692,16 @@@
                  << name
                  << HdSt_ResourceBindingSuffixTokens->fallback
                  << fallbackSwizzle << ")\n"
-                 << "#ifdef HD_HAS_" << name << "_" << HdStTokens->scale << "\n"
-                 << "        * HdGet_" << name << "_" << HdStTokens->scale 
 -                << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "\n"
 -                << "        * HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->scale 
++                << "#ifdef HD_HAS_" << name << "_" 
++                << HdStTokens->storm << "_" << HdStTokens->scale << "\n"
++                << "        * HdGet_" << name << "_" 
++                << HdStTokens->storm << "_" << HdStTokens->scale 
                  << "()" << swizzle << "\n"
                  << "#endif\n" 
-                 << "#ifdef HD_HAS_" << name << "_" << HdStTokens->bias << "\n"
-                 << "        + HdGet_" << name << "_" << HdStTokens->bias 
 -                << "#ifdef HD_HAS_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias << "\n"
 -                << "        + HdGet_" << name << "_" << HdStTokens->stormGenerated << "_" << HdStTokens->bias
++                << "#ifdef HD_HAS_" << name << "_" 
++                << HdStTokens->storm << "_" << HdStTokens->bias << "\n"
++                << "        + HdGet_" << name << "_" 
++                << HdStTokens->storm << "_" << HdStTokens->bias
                  << "()" << swizzle << "\n"
                  << "#endif\n"
                  << ");\n"
@@@ -5966,13 -5937,17 +5978,17 @@@ HdSt_CodeGen::_GenerateShaderParameters
  
              accessors 
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_" 
++                << HdStTokens->storm << "_" 
                  << HdStTokens->scale << "\n"
                  << "vec4 HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->scale << "();\n"
                  << "#endif\n"
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->bias << "\n"
                  << "vec4 HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->bias << "();\n"
                  << "#endif\n";
                  
@@@ -6014,13 -5989,17 +6030,17 @@@
                      << HdSt_ResourceBindingSuffixTokens->fallback
                      << fallbackSwizzle << ")\n"
                      << "#ifdef HD_HAS_" << it->second.name << "_"
 -                    << HdStTokens->stormGenerated << "_"
++                    << HdStTokens->storm << "_"
                      << HdStTokens->scale << "\n"
                      << "    * HdGet_" << it->second.name << "_" 
 -                    << HdStTokens->stormGenerated << "_"
++                    << HdStTokens->storm << "_"
                      << HdStTokens->scale << "()" << swizzle << "\n"
                      << "#endif\n" 
                      << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                    << HdStTokens->stormGenerated << "_"
++                    << HdStTokens->storm << "_"
                      << HdStTokens->bias << "\n"
                      << "    + HdGet_" << it->second.name << "_" 
 -                    << HdStTokens->stormGenerated << "_"
++                    << HdStTokens->storm << "_"
                      << HdStTokens->bias  << "()" << swizzle << "\n"
                      << "#endif\n"
                      << "    );\n  }\n";
@@@ -6029,13 -6008,17 +6049,17 @@@
              accessors
                  << "  return (ret\n"
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->scale << "\n"
                  << "    * HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->scale << "()\n"
                  << "#endif\n" 
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_" 
++                << HdStTokens->storm << "_" 
                  << HdStTokens->bias << "\n"
                  << "    + HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_" 
++                << HdStTokens->storm << "_" 
                  << HdStTokens->bias  << "()\n"
                  << "#endif\n"
                  << "  )" << swizzle << ";\n}\n";
@@@ -6086,13 -6069,17 +6110,17 @@@
  
              accessors 
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->scale << "\n"
                  << "FORWARD_DECL(vec4 HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->scale << "());\n"
                  << "#endif\n"
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_"
++                << HdStTokens->storm << "_"
                  << HdStTokens->bias << "\n"
                  << "FORWARD_DECL(vec4 HdGet_" << it->second.name << "_" 
 -                << HdStTokens->stormGenerated << "_" 
++                << HdStTokens->storm << "_" 
                  << HdStTokens->bias << "());\n"
                  << "#endif\n";
                  
@@@ -6136,14 -6123,14 +6164,16 @@@
                      << HdSt_ResourceBindingSuffixTokens->fallback
                      << fallbackSwizzle << ")\n"
                      << "#ifdef HD_HAS_" << it->second.name << "_"
-                     << HdStTokens->scale << "\n"
 -                    << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "\n"
++                    << HdStTokens->storm << "_" << HdStTokens->scale << "\n"
                      << "    * HdGet_" << it->second.name << "_" 
-                     << HdStTokens->scale << "()" << swizzle << "\n"
 -                    << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "()" << swizzle << "\n"
++                    << HdStTokens->storm << "_" << HdStTokens->scale << "()" 
++                    << swizzle << "\n"
                      << "#endif\n" 
                      << "#ifdef HD_HAS_" << it->second.name << "_" 
-                     << HdStTokens->bias << "\n"
 -                    << HdStTokens->stormGenerated << "_" << HdStTokens->bias << "\n"
++                    << HdStTokens->storm << "_" << HdStTokens->bias << "\n"
                      << "    + HdGet_" << it->second.name << "_" 
-                     << HdStTokens->bias  << "()" << swizzle << "\n"
 -                    << HdStTokens->stormGenerated << "_" << HdStTokens->bias  << "()" << swizzle << "\n"
++                    << HdStTokens->storm << "_" << HdStTokens->bias  << "()" 
++                    << swizzle << "\n"
                      << "#endif\n"
                      << "    );\n  }\n";
              }
@@@ -6151,14 -6138,14 +6181,14 @@@
              accessors
                  << "  return (ret\n"
                  << "#ifdef HD_HAS_" << it->second.name << "_"
-                 << HdStTokens->scale << "\n"
 -                << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "\n"
++                << HdStTokens->storm << "_" << HdStTokens->scale << "\n"
                  << "    * HdGet_" << it->second.name << "_" 
-                 << HdStTokens->scale << "()\n"
 -                << HdStTokens->stormGenerated << "_" << HdStTokens->scale << "()\n"
++                << HdStTokens->storm << "_" << HdStTokens->scale << "()\n"
                  << "#endif\n" 
                  << "#ifdef HD_HAS_" << it->second.name << "_" 
-                 << HdStTokens->bias << "\n"
 -                << HdStTokens->stormGenerated << "_" << HdStTokens->bias << "\n"
++                << HdStTokens->storm << "_" << HdStTokens->bias << "\n"
                  << "    + HdGet_" << it->second.name << "_" 
-                 << HdStTokens->bias  << "()\n"
 -                << HdStTokens->stormGenerated << "_" << HdStTokens->bias  << "()\n"
++                << HdStTokens->storm << "_" << HdStTokens->bias  << "()\n"
                  << "#endif\n"
                  << "  )" << swizzle << ";\n}\n";
  
diff --cc pxr/imaging/hdSt/materialNetwork.cpp
index fdb806a8043f75b48ff62b27e0c601ffe68ae4c1,0014d4afa3cae72228b70f7fe6bbd5be44a54f17..3f5796ef5f589630fc82b6e2c25122e038509ca0
--- 1/pxr/imaging/hdSt/materialNetwork.cpp
--- 2/pxr/imaging/hdSt/materialNetwork.cpp
+++ b/pxr/imaging/hdSt/materialNetwork.cpp
@@@ -830,7 -954,8 +830,8 @@@ _MakeMaterialParamsForTexture
      // Handle texture scale and bias
      HdSt_MaterialParam texScaleParam;
      texScaleParam.paramType = HdSt_MaterialParam::ParamTypeFallback;
-     texScaleParam.name = TfToken(paramName.GetString() + "_" + 
+     texScaleParam.name = TfToken(paramName.GetString() + "_" +
 -                                 HdStTokens->stormGenerated.GetString() + "_" +
++                                 HdStTokens->storm.GetString() + "_" +
                                   HdStTokens->scale.GetString());
      texScaleParam.fallbackValue = VtValue(_ResolveParameter(node, 
                                                              sdrNode, 
@@@ -840,7 -965,8 +841,8 @@@
  
      HdSt_MaterialParam texBiasParam;
      texBiasParam.paramType = HdSt_MaterialParam::ParamTypeFallback;
-     texBiasParam.name = TfToken(paramName.GetString() + "_" + 
+     texBiasParam.name = TfToken(paramName.GetString() + "_" +
 -                                HdStTokens->stormGenerated.GetString() + "_" +
++                                HdStTokens->storm.GetString() + "_" +
                                  HdStTokens->bias.GetString());
      texBiasParam.fallbackValue = VtValue(_ResolveParameter(node, 
                                                             sdrNode, 
diff --cc pxr/imaging/hdSt/tokens.h
index ac36c7daffbe512c396cf2d0d6a26634102c3e1f,0d84a4bdac0d80eb61f6a1e236ea4f7728963702..b5323a6f5a638a02c28f9ecba161f229454b479c
--- 1/pxr/imaging/hdSt/tokens.h
--- 2/pxr/imaging/hdSt/tokens.h
+++ b/pxr/imaging/hdSt/tokens.h
@@@ -75,7 -75,8 +75,8 @@@ PXR_NAMESPACE_OPEN_SCOP
      (pointSizeScale)                            \
      (screenSpaceWidths)                         \
      (minScreenSpaceWidths)                      \
-     (shadowCompareTextures)
+     (shadowCompareTextures)                     \
 -    ((stormGenerated, "hdSt"))
++    (storm)
  
  #define HDST_TEXTURE_TOKENS                     \
      (wrapS)                                     \
Domain: Graphics System / DALi;