From b9c44f8f6e98ff7a9cbeeb0d82ecbd41afae563d Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 19 Feb 2021 20:01:22 -0800
Subject: PipelineResourceSignatureD3D12Impl and
 PipelineResourceSignatureVkImpl: removed duplicate logic for hash calculation
 and compatiblitiy tests

---
 .../src/PipelineResourceSignatureVkImpl.cpp        | 54 ++++++----------------
 1 file changed, 14 insertions(+), 40 deletions(-)

(limited to 'Graphics/GraphicsEngineVulkan')

diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp
index 9bff0621..ddd59ae1 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp
@@ -624,20 +624,12 @@ size_t PipelineResourceSignatureVkImpl::CalculateHash() const
     if (m_Desc.NumResources == 0 && m_Desc.NumImmutableSamplers == 0)
         return 0;
 
-    size_t Hash = ComputeHash(m_Desc.NumResources, m_Desc.NumImmutableSamplers, m_Desc.BindingIndex);
-
+    auto Hash = CalculatePipelineResourceSignatureDescHash(m_Desc);
     for (Uint32 i = 0; i < m_Desc.NumResources; ++i)
     {
-        const auto& Res  = m_Desc.Resources[i];
         const auto& Attr = m_pResourceAttribs[i];
-
-        HashCombine(Hash, Res.ArraySize, Uint32{Res.ShaderStages}, Uint32{Res.VarType}, static_cast<Uint32>(Attr.GetDescriptorType()),
-                    Attr.BindingIndex, Attr.DescrSet, Attr.IsImmutableSamplerAssigned());
-    }
-
-    for (Uint32 i = 0; i < m_Desc.NumImmutableSamplers; ++i)
-    {
-        HashCombine(Hash, Uint32{m_Desc.ImmutableSamplers[i].ShaderStages}, m_Desc.ImmutableSamplers[i].Desc);
+        HashCombine(Hash, static_cast<Uint32>(Attr.GetDescriptorType()), Attr.BindingIndex, Attr.DescrType,
+                    Attr.DescrSet, Attr.IsImmutableSamplerAssigned(), Attr.SRBCacheOffset);
     }
 
     return Hash;
@@ -677,11 +669,14 @@ void PipelineResourceSignatureVkImpl::Destruct()
         m_pStaticResCache = nullptr;
     }
 
-    for (Uint32 i = 0; i < m_Desc.NumImmutableSamplers; ++i)
+    if (m_ImmutableSamplers != nullptr)
     {
-        m_ImmutableSamplers[i].~ImmutableSamplerAttribs();
+        for (Uint32 i = 0; i < m_Desc.NumImmutableSamplers; ++i)
+        {
+            m_ImmutableSamplers[i].~ImmutableSamplerAttribs();
+        }
+        m_ImmutableSamplers = nullptr;
     }
-    m_ImmutableSamplers = nullptr;
 
     if (void* pRawMem = m_pResourceAttribs)
     {
@@ -700,35 +695,14 @@ bool PipelineResourceSignatureVkImpl::IsCompatibleWith(const PipelineResourceSig
     if (GetHash() != Other.GetHash())
         return false;
 
-    if (GetDesc().BindingIndex != Other.GetDesc().BindingIndex)
-        return false;
-
-    const Uint32 LResCount = GetTotalResourceCount();
-    const Uint32 RResCount = Other.GetTotalResourceCount();
-
-    if (LResCount != RResCount)
-        return false;
-
-    for (Uint32 r = 0; r < LResCount; ++r)
-    {
-        if (!ResourcesCompatible(GetResourceAttribs(r), Other.GetResourceAttribs(r)) ||
-            !PipelineResourcesCompatible(GetResourceDesc(r), Other.GetResourceDesc(r)))
-            return false;
-    }
-
-    const Uint32 LSampCount = GetDesc().NumImmutableSamplers;
-    const Uint32 RSampCount = Other.GetDesc().NumImmutableSamplers;
-
-    if (LSampCount != RSampCount)
+    if (!PipelineResourceSignaturesCompatible(GetDesc(), Other.GetDesc()))
         return false;
 
-    for (Uint32 s = 0; s < LSampCount; ++s)
+    const auto ResCount = GetTotalResourceCount();
+    VERIFY_EXPR(ResCount == Other.GetTotalResourceCount());
+    for (Uint32 r = 0; r < ResCount; ++r)
     {
-        const auto& LSamp = GetDesc().ImmutableSamplers[s];
-        const auto& RSamp = Other.GetDesc().ImmutableSamplers[s];
-
-        if (LSamp.ShaderStages != RSamp.ShaderStages ||
-            !(LSamp.Desc == RSamp.Desc))
+        if (!ResourcesCompatible(GetResourceAttribs(r), Other.GetResourceAttribs(r)))
             return false;
     }
 
-- 
cgit v1.2.3