Unified PRS hash calculation

3 files changed, 19 insertions, 35 deletions

diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceAttribsGL.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceAttribsGL.hpp
index 9130f0fa..b668411c 100644
--- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceAttribsGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceAttribsGL.hpp
@@ -32,6 +32,7 @@
 
 #include "BasicTypes.h"
 #include "DebugUtilities.hpp"
+#include "HashUtils.hpp"
 
 namespace Diligent
 {
@@ -77,6 +78,20 @@ public:
     {
         return ImtblSamplerAssigned != 0;
     }
+
+    bool IsCompatibleWith(const PipelineResourceAttribsGL& rhs) const
+    {
+        // Ignore sampler index.
+        // clang-format off
+        return CacheOffset          == rhs.CacheOffset &&
+               ImtblSamplerAssigned == rhs.ImtblSamplerAssigned;
+        // clang-format on
+    }
+
+    size_t GetHash() const
+    {
+        return ComputeHash(CacheOffset, ImtblSamplerAssigned);
+    }
 };
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
index d4e159ae..db8f0246 100644
--- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
@@ -152,8 +152,6 @@ private:
 
     void Destruct();
 
-    size_t CalculateHash() const;
-
 private:
     TBindings m_BindingCount = {};
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp
index f48f82e5..8df6dccf 100644
--- a/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/PipelineResourceSignatureGLImpl.cpp
@@ -32,22 +32,6 @@
 namespace Diligent
 {
 
-namespace
-{
-
-inline bool ResourcesCompatible(const PipelineResourceSignatureGLImpl::ResourceAttribs& lhs,
-                                const PipelineResourceSignatureGLImpl::ResourceAttribs& rhs)
-{
-    // Ignore sampler index.
-    // clang-format off
-    return lhs.CacheOffset          == rhs.CacheOffset &&
-           lhs.ImtblSamplerAssigned == rhs.ImtblSamplerAssigned;
-    // clang-format on
-}
-
-} // namespace
-
-
 const char* GetBindingRangeName(BINDING_RANGE Range)
 {
     static_assert(BINDING_RANGE_COUNT == 4, "Please update the switch below to handle the new shader resource range");
@@ -139,7 +123,7 @@ PipelineResourceSignatureGLImpl::PipelineResourceSignatureGLImpl(IReferenceCount
             m_SRBMemAllocator.Initialize(m_Desc.SRBAllocationGranularity, GetNumActiveShaderStages(), ShaderVariableDataSizes.data(), 1, &CacheMemorySize);
         }
 
-        m_Hash = CalculateHash();
+        CalculateHash();
     }
     catch (...)
     {
@@ -209,21 +193,6 @@ void PipelineResourceSignatureGLImpl::CreateLayout()
     }
 }
 
-size_t PipelineResourceSignatureGLImpl::CalculateHash() const
-{
-    if (m_Desc.NumResources == 0 && m_Desc.NumImmutableSamplers == 0)
-        return 0;
-
-    auto Hash = CalculatePipelineResourceSignatureDescHash(m_Desc);
-    for (Uint32 i = 0; i < m_Desc.NumResources; ++i)
-    {
-        const auto& Attr = m_pResourceAttribs[i];
-        HashCombine(Hash, Attr.CacheOffset);
-    }
-
-    return Hash;
-}
-
 PipelineResourceSignatureGLImpl::~PipelineResourceSignatureGLImpl()
 {
     Destruct();
@@ -529,7 +498,9 @@ bool PipelineResourceSignatureGLImpl::IsCompatibleWith(const PipelineResourceSig
     VERIFY_EXPR(ResCount == Other.GetTotalResourceCount());
     for (Uint32 r = 0; r < ResCount; ++r)
     {
-        if (!ResourcesCompatible(GetResourceAttribs(r), Other.GetResourceAttribs(r)))
+        const auto& Res      = GetResourceAttribs(r);
+        const auto& OtherRes = Other.GetResourceAttribs(r);
+        if (!Res.IsCompatibleWith(OtherRes))
             return false;
     }