diff --git a/include/Nazara/Graphics/RenderTexture.hpp b/include/Nazara/Graphics/RenderTexture.hpp index bf846caa7..3d6249c67 100644 --- a/include/Nazara/Graphics/RenderTexture.hpp +++ b/include/Nazara/Graphics/RenderTexture.hpp @@ -20,7 +20,6 @@ namespace Nz { public: inline RenderTexture(std::shared_ptr targetTexture); - RenderTexture(std::shared_ptr targetTexture, PipelineStage targetPipelineStage, MemoryAccessFlags targetMemoryFlags, TextureLayout targetLayout); RenderTexture(const RenderTexture&) = delete; RenderTexture(RenderTexture&&) = delete; ~RenderTexture() = default; @@ -35,9 +34,6 @@ namespace Nz private: std::shared_ptr m_targetTexture; - MemoryAccessFlags m_targetMemoryFlags; - PipelineStage m_targetPipelineStage; - TextureLayout m_targetLayout; Vector2ui m_textureSize; }; } diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp index 70208ca48..987d28fad 100644 --- a/src/Nazara/Graphics/ForwardFramePipeline.cpp +++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp @@ -718,7 +718,7 @@ namespace Nz prevIt = it2; } - auto framePassCallback = [&, viewerData, renderMask](std::size_t /*passIndex*/, FramePass& framePass, FramePipelinePassFlags flags) + auto framePassCallback = [&, viewer = viewerData->viewer](std::size_t /*passIndex*/, FramePass& framePass, FramePipelinePassFlags flags) { // Inject previous final attachments as inputs for all passes, to force framegraph to order viewers passes relative to each other // TODO: Allow the user to define which pass of viewer A uses viewer B rendering diff --git a/src/Nazara/Graphics/RenderTexture.cpp b/src/Nazara/Graphics/RenderTexture.cpp index fcbfbf095..607c0fb0e 100644 --- a/src/Nazara/Graphics/RenderTexture.cpp +++ b/src/Nazara/Graphics/RenderTexture.cpp @@ -12,9 +12,6 @@ namespace Nz { RenderTexture::RenderTexture(std::shared_ptr texture, PipelineStage targetPipelineStage, MemoryAccessFlags targetMemoryFlags, TextureLayout targetLayout) : m_targetTexture(std::move(texture)), - m_targetMemoryFlags(targetMemoryFlags), - m_targetPipelineStage(targetPipelineStage), - m_targetLayout(targetLayout), m_textureSize(Vector2ui(m_targetTexture->GetSize())) { }