From b9e17ce89de7162e575e6faded0e111f8f5c9cea Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 20 May 2018 14:56:54 -0700
Subject: Added Vk pipeline layout hash

---
 Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp      | 2 +-
 Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'Graphics/GraphicsEngineVulkan')

diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
index a9ac994f..4e8ad773 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp
@@ -221,7 +221,7 @@ bool PipelineLayout::DescriptorSetLayoutManager::DescriptorSetLayout::operator =
 
 size_t PipelineLayout::DescriptorSetLayoutManager::DescriptorSetLayout::GetHash()const
 {
-    size_t Hash = ComputeHash(NumLayoutBindings, TotalDescriptors);
+    size_t Hash = ComputeHash(SetIndex, NumLayoutBindings, TotalDescriptors);
     for (uint32_t b = 0; b < NumLayoutBindings; ++b)
     {
         const auto &B = pBindings[b];
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
index 8bb7afa4..e7e0a578 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
@@ -392,9 +392,7 @@ PipelineStateVkImpl :: PipelineStateVkImpl(IReferenceCounters *pRefCounters, Ren
         m_pDefaultShaderResBinding.reset( NEW_RC_OBJ(SRBAllocator, "ShaderResourceBindingVkImpl instance", ShaderResourceBindingVkImpl, this)(this, true) );
     }
 
-#if 0
-    m_ShaderResourceLayoutHash = m_RootSig.GetHash();
-#endif
+    m_ShaderResourceLayoutHash = m_PipelineLayout.GetHash();
 }
 
 PipelineStateVkImpl::~PipelineStateVkImpl()
-- 
cgit v1.2.3