From ce265923d110dd8728cfce296e35d6000d861cf0 Mon Sep 17 00:00:00 2001 From: assiduous Date: Mon, 3 Feb 2020 22:59:50 -0800 Subject: Added rasterizer state, depth state and blend state validation and correction when creating a PSO --- Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index 6cfe1b1e..6213ce13 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -155,9 +155,9 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun } m_RootSig.Finalize(pd3d12Device); - if (PipelineDesc.IsComputePipeline) + if (m_Desc.IsComputePipeline) { - auto& ComputePipeline = PipelineDesc.ComputePipeline; + auto& ComputePipeline = m_Desc.ComputePipeline; if (ComputePipeline.pCS == nullptr) LOG_ERROR_AND_THROW("Compute shader is not set in the pipeline desc"); @@ -189,7 +189,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun } else { - const auto& GraphicsPipeline = PipelineDesc.GraphicsPipeline; + const auto& GraphicsPipeline = m_Desc.GraphicsPipeline; D3D12_GRAPHICS_PIPELINE_STATE_DESC d3d12PSODesc = {}; @@ -281,7 +281,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun m_RootSig.GetD3D12RootSignature()->SetName(WidenString(RootSignatureDesc).c_str()); } - if (PipelineDesc.SRBAllocationGranularity > 1) + if (m_Desc.SRBAllocationGranularity > 1) { std::array ShaderVarMgrDataSizes = {}; for (Uint32 s = 0; s < m_NumShaders; ++s) @@ -297,7 +297,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun } auto CacheMemorySize = m_RootSig.GetResourceCacheRequiredMemSize(); - m_SRBMemAllocator.Initialize(PipelineDesc.SRBAllocationGranularity, m_NumShaders, ShaderVarMgrDataSizes.data(), 1, &CacheMemorySize); + m_SRBMemAllocator.Initialize(m_Desc.SRBAllocationGranularity, m_NumShaders, ShaderVarMgrDataSizes.data(), 1, &CacheMemorySize); } m_ShaderResourceLayoutHash = m_RootSig.GetHash(); -- cgit v1.2.3