Minor fixes

This commit is contained in:
SirLynix
2023-11-17 11:58:03 +01:00
parent ddc8cc6797
commit 5a14808a57
7 changed files with 15 additions and 8 deletions

View File

@@ -372,7 +372,7 @@ namespace Nz
if (m_rebuildFrameGraph)
{
renderFrame.PushForRelease(std::move(m_bakedFrameGraph));
m_bakedFrameGraph = BuildFrameGraph();
m_bakedFrameGraph = BuildFrameGraph(renderFrame);
m_bakedFrameGraph.Resize(renderFrame);
frameGraphInvalidated = true;
}
@@ -689,7 +689,7 @@ namespace Nz
}
}
BakedFrameGraph ForwardFramePipeline::BuildFrameGraph()
BakedFrameGraph ForwardFramePipeline::BuildFrameGraph(RenderFrame& renderFrame)
{
FrameGraph frameGraph;
@@ -748,7 +748,13 @@ namespace Nz
return lhs.second->renderOrder < rhs.second->renderOrder;
});
for (auto&& [_, renderTargetData] : m_renderTargets)
{
if (renderTargetData.blitShaderBinding)
renderFrame.PushForRelease(std::move(renderTargetData.blitShaderBinding));
}
m_renderTargets.clear();
for (auto&& [renderTarget, viewerData] : viewers)
{
auto& renderTargetData = m_renderTargets[renderTarget];

View File

@@ -159,11 +159,12 @@ namespace Nz
forwardPass.AddOutput(inputOuputs.outputAttachments[0]);
if (inputOuputs.depthStencilInput != FramePipelinePass::InvalidAttachmentIndex)
forwardPass.SetDepthStencilInput(inputOuputs.depthStencilInput);
else
forwardPass.SetDepthStencilClear(1.f, 0);
forwardPass.SetDepthStencilOutput(inputOuputs.depthStencilOutput);
forwardPass.SetClearColor(0, m_viewer->GetClearColor());
forwardPass.SetDepthStencilClear(1.f, 0);
forwardPass.SetExecutionCallback([&]()
{

View File

@@ -1135,7 +1135,7 @@ namespace Nz
return false;
}
return LoadFaceFromImage(face, *image);;
return LoadFaceFromImage(face, *image);
}
bool Image::SaveToFile(const std::filesystem::path& filePath, const ImageParams& params)