use NUM_SHADER_TYPES constant instead of magic number, use std::array instead of c-style array.

2 files changed, 5 insertions, 3 deletions

diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
index d3915425..d93a72ac 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
@@ -78,9 +78,9 @@ private:
     ShaderVariableManagerVk* m_pShaderVarMgrs = nullptr;
 
     // Shader variable manager index in m_pShaderVarMgrs[] array for every shader stage
-    Int8  m_ResourceLayoutIndex[6]      = {-1, -1, -1, -1, -1, -1};
-    bool  m_bStaticResourcesInitialized = false;
-    Uint8 m_NumShaders                  = 0;
+    std::array<Int8, NUM_SHADER_TYPES> m_ResourceLayoutIndex;
+    bool                               m_bStaticResourcesInitialized = false;
+    Uint8                              m_NumShaders                  = 0;
 };
 
 } // namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
index ee6a3709..b978c592 100644
--- a/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/ShaderResourceBindingVkImpl.cpp
@@ -47,6 +47,8 @@ ShaderResourceBindingVkImpl::ShaderResourceBindingVkImpl(IReferenceCounters*  pR
     m_ShaderResourceCache{ShaderResourceCacheVk::DbgCacheContentType::SRBResources}
 // clang-format on
 {
+    m_ResourceLayoutIndex.fill(-1);
+
     auto* ppShaders = pPSO->GetShaders();
     m_NumShaders    = static_cast<decltype(m_NumShaders)>(pPSO->GetNumShaders());