HnMaterial: a couple of minor fixes

TheMostDiligent · TheMostDiligent · commit 6ce3727d5e0f · 2024-11-24T11:18:19.000-08:00
diff --git a/Hydrogent/src/HnMaterial.cpp b/Hydrogent/src/HnMaterial.cpp
@@ -851,7 +851,7 @@ void HnMaterial::AllocateBufferSpace(HnRenderDelegate& RenderDelegate)
 
     m_PSOFlags         = HnRenderPass::GetMaterialPSOFlags(*this);
     Uint32 AttribsSize = UsdRenderer.GetPBRMaterialAttribsSize(m_PSOFlags);
-    if (m_PBRMaterialAttribsBufferOffset == ~0u || AttribsSize > m_PBRMaterialAttribsSize)
+    if (m_PBRMaterialAttribsBufferOffset == ~0u || AttribsSize != m_PBRMaterialAttribsSize)
     {
         if (!m_SRBCache)
         {
@@ -1363,7 +1363,10 @@ void HnMaterial::EndResourceUpdate(HnRenderDelegate& RenderDelegate)
 
 HnMaterial::~HnMaterial()
 {
-    m_SRBCache->AllocateBufferOffset(m_PBRMaterialAttribsBufferOffset, m_PBRMaterialAttribsSize, 0);
+    if (m_SRBCache)
+    {
+        m_SRBCache->AllocateBufferOffset(m_PBRMaterialAttribsBufferOffset, m_PBRMaterialAttribsSize, 0);
+    }
 }
 
 } // namespace USD

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ void HnMaterial::AllocateBufferSpace(HnRenderDelegate& RenderDelegate)`
`851`	`851`
`852`	`852`	`m_PSOFlags = HnRenderPass::GetMaterialPSOFlags(*this);`
`853`	`853`	`Uint32 AttribsSize = UsdRenderer.GetPBRMaterialAttribsSize(m_PSOFlags);`
`854`		`- if (m_PBRMaterialAttribsBufferOffset == ~0u \|\| AttribsSize > m_PBRMaterialAttribsSize)`
	`854`	`+ if (m_PBRMaterialAttribsBufferOffset == ~0u \|\| AttribsSize != m_PBRMaterialAttribsSize)`
`855`	`855`	`{`
`856`	`856`	`if (!m_SRBCache)`
`857`	`857`	`{`
`@@ -1363,7 +1363,10 @@ void HnMaterial::EndResourceUpdate(HnRenderDelegate& RenderDelegate)`
`1363`	`1363`
`1364`	`1364`	`HnMaterial::~HnMaterial()`
`1365`	`1365`	`{`
`1366`		`- m_SRBCache->AllocateBufferOffset(m_PBRMaterialAttribsBufferOffset, m_PBRMaterialAttribsSize, 0);`
	`1366`	`+ if (m_SRBCache)`
	`1367`	`+ {`
	`1368`	`+ m_SRBCache->AllocateBufferOffset(m_PBRMaterialAttribsBufferOffset, m_PBRMaterialAttribsSize, 0);`
	`1369`	`+ }`
`1367`	`1370`	`}`
`1368`	`1371`
`1369`	`1372`	`} // namespace USD`