summaryrefslogtreecommitdiffstats
path: root/Imgui/src/ImGuiDiligentRenderer.cpp
diff options
context:
space:
mode:
authorazhirnov <zh1dron@gmail.com>2020-10-15 18:23:02 +0000
committerazhirnov <zh1dron@gmail.com>2020-10-15 18:23:02 +0000
commit17ce0880a5a53f62e84c950d0bc542db2bf33b80 (patch)
treeb1a9d76ba44ecb2f93c4e38a17dbe3c913f5092f /Imgui/src/ImGuiDiligentRenderer.cpp
parentAppBase: added CompareUpdate golden image mode (diff)
downloadDiligentTools-17ce0880a5a53f62e84c950d0bc542db2bf33b80.tar.gz
DiligentTools-17ce0880a5a53f62e84c950d0bc542db2bf33b80.zip
Fixed compilation after PSO refactoring
Diffstat (limited to 'Imgui/src/ImGuiDiligentRenderer.cpp')
-rw-r--r--Imgui/src/ImGuiDiligentRenderer.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/Imgui/src/ImGuiDiligentRenderer.cpp b/Imgui/src/ImGuiDiligentRenderer.cpp
index 289bacd..116691e 100644
--- a/Imgui/src/ImGuiDiligentRenderer.cpp
+++ b/Imgui/src/ImGuiDiligentRenderer.cpp
@@ -297,19 +297,18 @@ void ImGuiDiligentRenderer::CreateDeviceObjects()
m_pDevice->CreateShader(ShaderCI, &pPS);
}
- PipelineStateCreateInfo PSOCreateInfo;
- PipelineStateDesc& PSODesc = PSOCreateInfo.PSODesc;
+ GraphicsPipelineStateCreateInfo PSOCreateInfo;
- PSODesc.Name = "ImGUI PSO";
- auto& GraphicsPipeline = PSODesc.GraphicsPipeline;
+ PSOCreateInfo.PSODesc.Name = "ImGUI PSO";
+ auto& GraphicsPipeline = PSOCreateInfo.GraphicsPipeline;
GraphicsPipeline.NumRenderTargets = 1;
GraphicsPipeline.RTVFormats[0] = m_BackBufferFmt;
GraphicsPipeline.DSVFormat = m_DepthBufferFmt;
GraphicsPipeline.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
- GraphicsPipeline.pVS = pVS;
- GraphicsPipeline.pPS = pPS;
+ PSOCreateInfo.pVS = pVS;
+ PSOCreateInfo.pPS = pPS;
GraphicsPipeline.RasterizerDesc.CullMode = CULL_MODE_NONE;
GraphicsPipeline.RasterizerDesc.ScissorEnable = True;
@@ -338,8 +337,8 @@ void ImGuiDiligentRenderer::CreateDeviceObjects()
{
{SHADER_TYPE_PIXEL, "Texture", SHADER_RESOURCE_VARIABLE_TYPE_DYNAMIC} //
};
- PSODesc.ResourceLayout.Variables = Variables;
- PSODesc.ResourceLayout.NumVariables = _countof(Variables);
+ PSOCreateInfo.PSODesc.ResourceLayout.Variables = Variables;
+ PSOCreateInfo.PSODesc.ResourceLayout.NumVariables = _countof(Variables);
SamplerDesc SamLinearWrap;
SamLinearWrap.AddressU = TEXTURE_ADDRESS_WRAP;
@@ -349,10 +348,10 @@ void ImGuiDiligentRenderer::CreateDeviceObjects()
{
{SHADER_TYPE_PIXEL, "Texture", SamLinearWrap} //
};
- PSODesc.ResourceLayout.StaticSamplers = StaticSamplers;
- PSODesc.ResourceLayout.NumStaticSamplers = _countof(StaticSamplers);
+ PSOCreateInfo.PSODesc.ResourceLayout.StaticSamplers = StaticSamplers;
+ PSOCreateInfo.PSODesc.ResourceLayout.NumStaticSamplers = _countof(StaticSamplers);
- m_pDevice->CreatePipelineState(PSOCreateInfo, &m_pPSO);
+ m_pDevice->CreateGraphicsPipelineState(PSOCreateInfo, &m_pPSO);
{
BufferDesc BuffDesc;