From 0fe2f25bf315c7955c84b647f93a2027ab92a702 Mon Sep 17 00:00:00 2001 From: azhirnov Date: Thu, 15 Oct 2020 21:21:00 +0300 Subject: Fixed compilation after PSO refactoring --- Components/src/ShadowMapManager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Components/src/ShadowMapManager.cpp') diff --git a/Components/src/ShadowMapManager.cpp b/Components/src/ShadowMapManager.cpp index 25ea76f..d2c9723 100644 --- a/Components/src/ShadowMapManager.cpp +++ b/Components/src/ShadowMapManager.cpp @@ -419,7 +419,7 @@ void ShadowMapManager::InitializeConversionTechniques(TEXTURE_FORMAT FilterableS if (Tech.PSO) { - if (Tech.PSO->GetDesc().GraphicsPipeline.RTVFormats[0] != FilterableShadowMapFmt) + if (Tech.PSO->GetGraphicsPipelineDesc().RTVFormats[0] != FilterableShadowMapFmt) Tech = ShadowConversionTechnique(); else continue; // Already up to date @@ -438,8 +438,8 @@ void ShadowMapManager::InitializeConversionTechniques(TEXTURE_FORMAT FilterableS m_pDevice->CreateShader(VertShaderCI, &pScreenSizeTriVS); } - PipelineStateCreateInfo PSOCreateInfo; - PipelineStateDesc& PSODesc = PSOCreateInfo.PSODesc; + GraphicsPipelineStateCreateInfo PSOCreateInfo; + PipelineStateDesc& PSODesc = PSOCreateInfo.PSODesc; ShaderCreateInfo ShaderCI; ShaderCI.Desc.ShaderType = SHADER_TYPE_PIXEL; @@ -486,21 +486,21 @@ void ShadowMapManager::InitializeConversionTechniques(TEXTURE_FORMAT FilterableS PSODesc.ResourceLayout.Variables = Variables; PSODesc.ResourceLayout.NumVariables = _countof(Variables); - auto& GraphicsPipeline = PSODesc.GraphicsPipeline; + auto& GraphicsPipeline = PSOCreateInfo.GraphicsPipeline; GraphicsPipeline.RasterizerDesc.FillMode = FILL_MODE_SOLID; GraphicsPipeline.RasterizerDesc.CullMode = CULL_MODE_NONE; GraphicsPipeline.DepthStencilDesc.DepthEnable = False; - GraphicsPipeline.pVS = pScreenSizeTriVS; - GraphicsPipeline.pPS = pVSMHorzPS; + PSOCreateInfo.pVS = pScreenSizeTriVS; + PSOCreateInfo.pPS = pVSMHorzPS; GraphicsPipeline.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; GraphicsPipeline.NumRenderTargets = 1; GraphicsPipeline.RTVFormats[0] = FilterableShadowMapFmt; - m_pDevice->CreatePipelineState(PSOCreateInfo, &Tech.PSO); + m_pDevice->CreateGraphicsPipelineState(PSOCreateInfo, &Tech.PSO); Tech.PSO->GetStaticVariableByName(SHADER_TYPE_PIXEL, "cbConversionAttribs")->Set(m_pConversionAttribsBuffer); - if (m_BlurVertTech.PSO && m_BlurVertTech.PSO->GetDesc().GraphicsPipeline.RTVFormats[0] != FilterableShadowMapFmt) + if (m_BlurVertTech.PSO && m_BlurVertTech.PSO->GetGraphicsPipelineDesc().RTVFormats[0] != FilterableShadowMapFmt) m_BlurVertTech.PSO.Release(); if (!m_BlurVertTech.PSO) @@ -510,8 +510,8 @@ void ShadowMapManager::InitializeConversionTechniques(TEXTURE_FORMAT FilterableS PSODesc.Name = "Vertical blur pass PSO"; RefCntAutoPtr pVertBlurPS; m_pDevice->CreateShader(ShaderCI, &pVertBlurPS); - GraphicsPipeline.pPS = pVertBlurPS; - m_pDevice->CreatePipelineState(PSOCreateInfo, &m_BlurVertTech.PSO); + PSOCreateInfo.pPS = pVertBlurPS; + m_pDevice->CreateGraphicsPipelineState(PSOCreateInfo, &m_BlurVertTech.PSO); m_BlurVertTech.PSO->GetStaticVariableByName(SHADER_TYPE_PIXEL, "cbConversionAttribs")->Set(m_pConversionAttribsBuffer); } } -- cgit v1.2.3