git.s-ol.nu ~forks/DiligentTools / 17ce088
Fixed compilation after PSO refactoring azhirnov 8 months ago
1 changed file(s) with 12 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all
296296 m_pDevice->CreateShader(ShaderCI, &pPS);
297297 }
298298
299 PipelineStateCreateInfo PSOCreateInfo;
300 PipelineStateDesc& PSODesc = PSOCreateInfo.PSODesc;
301
302 PSODesc.Name = "ImGUI PSO";
303 auto& GraphicsPipeline = PSODesc.GraphicsPipeline;
299 GraphicsPipelineStateCreateInfo PSOCreateInfo;
300
301 PSOCreateInfo.PSODesc.Name = "ImGUI PSO";
302 auto& GraphicsPipeline = PSOCreateInfo.GraphicsPipeline;
304303
305304 GraphicsPipeline.NumRenderTargets = 1;
306305 GraphicsPipeline.RTVFormats[0] = m_BackBufferFmt;
307306 GraphicsPipeline.DSVFormat = m_DepthBufferFmt;
308307 GraphicsPipeline.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
309308
310 GraphicsPipeline.pVS = pVS;
311 GraphicsPipeline.pPS = pPS;
309 PSOCreateInfo.pVS = pVS;
310 PSOCreateInfo.pPS = pPS;
312311
313312 GraphicsPipeline.RasterizerDesc.CullMode = CULL_MODE_NONE;
314313 GraphicsPipeline.RasterizerDesc.ScissorEnable = True;
337336 {
338337 {SHADER_TYPE_PIXEL, "Texture", SHADER_RESOURCE_VARIABLE_TYPE_DYNAMIC} //
339338 };
340 PSODesc.ResourceLayout.Variables = Variables;
341 PSODesc.ResourceLayout.NumVariables = _countof(Variables);
339 PSOCreateInfo.PSODesc.ResourceLayout.Variables = Variables;
340 PSOCreateInfo.PSODesc.ResourceLayout.NumVariables = _countof(Variables);
342341
343342 SamplerDesc SamLinearWrap;
344343 SamLinearWrap.AddressU = TEXTURE_ADDRESS_WRAP;
348347 {
349348 {SHADER_TYPE_PIXEL, "Texture", SamLinearWrap} //
350349 };
351 PSODesc.ResourceLayout.StaticSamplers = StaticSamplers;
352 PSODesc.ResourceLayout.NumStaticSamplers = _countof(StaticSamplers);
353
354 m_pDevice->CreatePipelineState(PSOCreateInfo, &m_pPSO);
350 PSOCreateInfo.PSODesc.ResourceLayout.StaticSamplers = StaticSamplers;
351 PSOCreateInfo.PSODesc.ResourceLayout.NumStaticSamplers = _countof(StaticSamplers);
352
353 m_pDevice->CreateGraphicsPipelineState(PSOCreateInfo, &m_pPSO);
355354
356355 {
357356 BufferDesc BuffDesc;