diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-05-20 21:56:54 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-05-20 21:56:54 +0000 |
| commit | b9e17ce89de7162e575e6faded0e111f8f5c9cea (patch) | |
| tree | 4f0bad3c642433f47200e5d037cbdecbdec565cb /Graphics/GraphicsEngineVulkan | |
| parent | Imlemented pipeline compatibility test in Vulkan (diff) | |
| download | DiligentCore-b9e17ce89de7162e575e6faded0e111f8f5c9cea.tar.gz DiligentCore-b9e17ce89de7162e575e6faded0e111f8f5c9cea.zip | |
Added Vk pipeline layout hash
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
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() |