summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-02-04 06:59:50 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-02-04 06:59:50 +0000
commitce265923d110dd8728cfce296e35d6000d861cf0 (patch)
treeb3fc29b0ea169240f555b122a0eb9ac3881fe3a0 /Graphics/GraphicsEngineVulkan
parentFixed minor formatting issue (diff)
downloadDiligentCore-ce265923d110dd8728cfce296e35d6000d861cf0.tar.gz
DiligentCore-ce265923d110dd8728cfce296e35d6000d861cf0.zip
Added rasterizer state, depth state and blend state validation and correction when creating a PSO
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
index 282c69e4..1d2339a4 100644
--- a/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp
@@ -179,15 +179,15 @@ PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* pRefCounters,
auto* pStaticResLayout = new (m_ShaderResourceLayouts + m_NumShaders + s) ShaderResourceLayoutVk(LogicalDevice);
auto* pStaticResCache = new (m_StaticResCaches + s) ShaderResourceCacheVk(ShaderResourceCacheVk::DbgCacheContentType::StaticShaderResources);
- pStaticResLayout->InitializeStaticResourceLayout(ShaderResources[s], ShaderResLayoutAllocator, PipelineDesc.ResourceLayout, m_StaticResCaches[s]);
+ pStaticResLayout->InitializeStaticResourceLayout(ShaderResources[s], ShaderResLayoutAllocator, m_Desc.ResourceLayout, m_StaticResCaches[s]);
new (m_StaticVarsMgrs + s) ShaderVariableManagerVk(*this, *pStaticResLayout, GetRawAllocator(), nullptr, 0, *pStaticResCache);
}
ShaderResourceLayoutVk::Initialize(pDeviceVk, m_NumShaders, m_ShaderResourceLayouts, ShaderResources.data(), GetRawAllocator(),
- PipelineDesc.ResourceLayout, ShaderSPIRVs.data(), m_PipelineLayout);
+ m_Desc.ResourceLayout, ShaderSPIRVs.data(), m_PipelineLayout);
m_PipelineLayout.Finalize(LogicalDevice);
- if (PipelineDesc.SRBAllocationGranularity > 1)
+ if (m_Desc.SRBAllocationGranularity > 1)
{
std::array<size_t, MAX_SHADERS_IN_PIPELINE> ShaderVariableDataSizes = {};
for (Uint32 s = 0; s < m_NumShaders; ++s)
@@ -202,7 +202,7 @@ PipelineStateVkImpl::PipelineStateVkImpl(IReferenceCounters* pRefCounters,
auto DescriptorSetSizes = m_PipelineLayout.GetDescriptorSetSizes(NumSets);
auto CacheMemorySize = ShaderResourceCacheVk::GetRequiredMemorySize(NumSets, DescriptorSetSizes.data());
- m_SRBMemAllocator.Initialize(PipelineDesc.SRBAllocationGranularity, m_NumShaders, ShaderVariableDataSizes.data(), 1, &CacheMemorySize);
+ m_SRBMemAllocator.Initialize(m_Desc.SRBAllocationGranularity, m_NumShaders, ShaderVariableDataSizes.data(), 1, &CacheMemorySize);
}
// Create shader modules and initialize shader stages