From 7d0707a60b70d867541e4ebd918c3f3c4c26be4a Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 8 May 2018 20:28:07 -0700 Subject: Implemented ShaderResourceLayoutVk::InitializeStaticResources() --- Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp index c8476e4c..4cd3a639 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp @@ -826,9 +826,11 @@ void ShaderResourceLayoutD3D12::CopyStaticResourceDesriptorHandles(const ShaderR if (!SrcLayout.m_pResourceCache) { - LOG_ERROR("Dst layout has no resource cache"); + LOG_ERROR("Src layout has no resource cache"); return; + } + VERIFY(SrcLayout.m_pResources->GetShaderType() == m_pResources->GetShaderType(), "Incosistent shader types"); // Static shader resources are stored as follows: // CBVs at root index D3D12_DESCRIPTOR_RANGE_TYPE_CBV, @@ -841,7 +843,6 @@ void ShaderResourceLayoutD3D12::CopyStaticResourceDesriptorHandles(const ShaderR { // Get resource attributes const auto &res = GetSrvCbvUav(SHADER_VARIABLE_TYPE_STATIC, r); - VERIFY(SrcLayout.m_pResources->GetShaderType() == m_pResources->GetShaderType(), "Incosistent shader types"); auto RangeType = GetDescriptorRangeType(res.GetResType()); for(Uint32 ArrInd = 0; ArrInd < res.Attribs.BindCount; ++ArrInd) { -- cgit v1.2.3