sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Lynix 2023-11-21 22:07:00 +01:00
parent 80cab34088
commit 5f796666f0
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Core/Posix/FileImpl.cpp
View File

@ -3,10 +3,10 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Core/Posix/FileImpl.hpp> #include <Nazara/Core/Posix/FileImpl.hpp>
#include <NazaraUtils/Algorithm.hpp>
#include <Nazara/Core/Algorithm.hpp> #include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/StringExt.hpp> #include <Nazara/Core/StringExt.hpp>
#include <NazaraUtils/Algorithm.hpp>
#include <cstdio> #include <cstdio>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>

13
src/Nazara/Graphics/ForwardFramePipeline.cpp
View File

@ -500,18 +500,9 @@ namespace Nz
m_bakedFrameGraph.Execute(renderFrame); m_bakedFrameGraph.Execute(renderFrame);
m_rebuildFrameGraph = false; m_rebuildFrameGraph = false;
// Final blit (TODO: Make part of frame graph) // Final blit (TODO: Make part of frame graph?)
for (auto&& [renderTargetPtr, renderTargetData] : m_renderTargets) for (auto&& [renderTargetPtr, renderTargetData] : m_renderTargets)
{ renderTargetPtr->OnRenderEnd(renderFrame, m_bakedFrameGraph, renderTargetData.finalAttachment);
const RenderTarget& renderTarget = *renderTargetPtr;
const auto& data = renderTargetData;
renderTarget.OnRenderEnd(renderFrame, m_bakedFrameGraph, data.finalAttachment);
renderFrame.Execute([&](CommandBufferBuilder& builder)
{
}, QueueType::Graphics);
}
// reset at the end instead of the beginning so debug draw can be used before calling this method // reset at the end instead of the beginning so debug draw can be used before calling this method
DebugDrawer& debugDrawer = GetDebugDrawer(); DebugDrawer& debugDrawer = GetDebugDrawer();

1
src/Nazara/Graphics/RenderTexture.cpp
View File

@ -4,7 +4,6 @@
#include <Nazara/Graphics/RenderTexture.hpp> #include <Nazara/Graphics/RenderTexture.hpp>
#include <Nazara/Graphics/FrameGraph.hpp> #include <Nazara/Graphics/FrameGraph.hpp>
#include <Nazara/Renderer/CommandBufferBuilder.hpp>
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Graphics/Debug.hpp> #include <Nazara/Graphics/Debug.hpp>

2
src/Nazara/Utility/Image.cpp
View File

@ -3,13 +3,13 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Image.hpp> #include <Nazara/Utility/Image.hpp>
#include <NazaraUtils/StackArray.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/ErrorFlags.hpp> #include <Nazara/Core/ErrorFlags.hpp>
#include <Nazara/Core/StringExt.hpp> #include <Nazara/Core/StringExt.hpp>
#include <Nazara/Utility/Config.hpp> #include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/PixelFormat.hpp> #include <Nazara/Utility/PixelFormat.hpp>
#include <Nazara/Utility/Utility.hpp> #include <Nazara/Utility/Utility.hpp>
#include <NazaraUtils/StackArray.hpp>
#include <memory> #include <memory>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>