From 5f796666f0900694766dbaf9cb24f19092177641 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Tue, 21 Nov 2023 22:07:00 +0100
Subject: [PATCH] Minor fixes

---
 src/Nazara/Core/Posix/FileImpl.cpp           |  2 +-
 src/Nazara/Graphics/ForwardFramePipeline.cpp | 13 ++-----------
 src/Nazara/Graphics/RenderTexture.cpp        |  1 -
 src/Nazara/Utility/Image.cpp                 |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp
index f62cfa5c9..5c012cb6d 100644
--- a/src/Nazara/Core/Posix/FileImpl.cpp
+++ b/src/Nazara/Core/Posix/FileImpl.cpp
@@ -3,10 +3,10 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Posix/FileImpl.hpp>
-#include <NazaraUtils/Algorithm.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
+#include <NazaraUtils/Algorithm.hpp>
 #include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp
index 07bf1d85d..397885096 100644
--- a/src/Nazara/Graphics/ForwardFramePipeline.cpp
+++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp
@@ -500,18 +500,9 @@ namespace Nz
 		m_bakedFrameGraph.Execute(renderFrame);
 		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)
-		{
-			const RenderTarget& renderTarget = *renderTargetPtr;
-			const auto& data = renderTargetData;
-
-			renderTarget.OnRenderEnd(renderFrame, m_bakedFrameGraph, data.finalAttachment);
-
-			renderFrame.Execute([&](CommandBufferBuilder& builder)
-			{
-			}, QueueType::Graphics);
-		}
+			renderTargetPtr->OnRenderEnd(renderFrame, m_bakedFrameGraph, renderTargetData.finalAttachment);
 
 		// reset at the end instead of the beginning so debug draw can be used before calling this method
 		DebugDrawer& debugDrawer = GetDebugDrawer();
diff --git a/src/Nazara/Graphics/RenderTexture.cpp b/src/Nazara/Graphics/RenderTexture.cpp
index f7f64a80b..bc85c549a 100644
--- a/src/Nazara/Graphics/RenderTexture.cpp
+++ b/src/Nazara/Graphics/RenderTexture.cpp
@@ -4,7 +4,6 @@
 
 #include <Nazara/Graphics/RenderTexture.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
-#include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
diff --git a/src/Nazara/Utility/Image.cpp b/src/Nazara/Utility/Image.cpp
index 0670ee3fe..b2c6a9ed8 100644
--- a/src/Nazara/Utility/Image.cpp
+++ b/src/Nazara/Utility/Image.cpp
@@ -3,13 +3,13 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/Image.hpp>
-#include <NazaraUtils/StackArray.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Utility/Config.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Utility/Utility.hpp>
+#include <NazaraUtils/StackArray.hpp>
 #include <memory>
 #include <Nazara/Utility/Debug.hpp>