Minor fixes
This commit is contained in:
parent
ddc8cc6797
commit
5a14808a57
|
|
@ -80,7 +80,7 @@ namespace Nz
|
|||
ForwardFramePipeline& operator=(ForwardFramePipeline&&) = delete;
|
||||
|
||||
private:
|
||||
BakedFrameGraph BuildFrameGraph();
|
||||
BakedFrameGraph BuildFrameGraph(RenderFrame& renderFrame);
|
||||
|
||||
void RegisterMaterialInstance(MaterialInstance* materialPass);
|
||||
void UnregisterMaterialInstance(MaterialInstance* material);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace Nz
|
|||
{
|
||||
inline void RenderSystem::AttachExternalSwapchain(WindowSwapchain& swapchain)
|
||||
{
|
||||
m_windowSwapchains.emplace_back(&swapchain);
|
||||
m_externalSwapchains.emplace_back(swapchain);
|
||||
}
|
||||
|
||||
inline void RenderSystem::DetachExternalSwapchain(WindowSwapchain& swapchain)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Nz
|
|||
|
||||
private:
|
||||
std::size_t m_freeCommandBufferIndex;
|
||||
std::vector<VkCommandBuffer> m_allocatedCommandBuffers;;
|
||||
std::vector<VkCommandBuffer> m_allocatedCommandBuffers;
|
||||
std::vector<VkCommandBuffer> m_graphicalCommandBuffers;
|
||||
VulkanSwapchain& m_owner;
|
||||
Vk::CommandPool m_commandPool;
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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([&]()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ int main()
|
|||
program.GetActiveUniformBlock(blockIndex, GL_UNIFORM_BLOCK_DATA_SIZE, &dataSize);
|
||||
|
||||
if (fieldOffsets.GetAlignedSize() != std::size_t(dataSize))
|
||||
std::cout << "size mismatch (computed " << fieldOffsets.GetAlignedSize() << ", reference has " << dataSize << ")" << std::endl;;
|
||||
std::cout << "size mismatch (computed " << fieldOffsets.GetAlignedSize() << ", reference has " << dataSize << ")" << std::endl;
|
||||
|
||||
if (computedOffsets.size() != uniformIndices.size())
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue