From 6457854e03220a20d771b1a47ed3e60eca4be96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 4 Feb 2022 13:54:26 +0100 Subject: [PATCH] Minor fixes --- include/Nazara/Graphics/FramePass.hpp | 3 +-- include/Nazara/Graphics/FramePass.inl | 5 ++--- include/Nazara/Graphics/InstancedRenderable.inl | 1 + include/Nazara/Math/Frustum.inl | 12 ++++++------ include/Nazara/Renderer/RenderPassCache.hpp | 2 +- include/Nazara/Utility/IndexBuffer.hpp | 2 +- src/Nazara/Graphics/ForwardFramePipeline.cpp | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/Nazara/Graphics/FramePass.hpp b/include/Nazara/Graphics/FramePass.hpp index 69f870145..6e94ec39b 100644 --- a/include/Nazara/Graphics/FramePass.hpp +++ b/include/Nazara/Graphics/FramePass.hpp @@ -67,7 +67,7 @@ namespace Nz inline void SetReadInput(std::size_t inputIndex, bool doesRead); FramePass& operator=(const FramePass&) = delete; - FramePass& operator=(FramePass&&) noexcept = default; + FramePass& operator=(FramePass&&) = delete; static constexpr std::size_t InvalidAttachmentId = std::numeric_limits::max(); @@ -97,7 +97,6 @@ namespace Nz std::string m_name; std::vector m_inputs; std::vector m_outputs; - FrameGraph& m_owner; CommandCallback m_commandCallback; ExecutionCallback m_executionCallback; }; diff --git a/include/Nazara/Graphics/FramePass.inl b/include/Nazara/Graphics/FramePass.inl index da3d7b99e..f36d36691 100644 --- a/include/Nazara/Graphics/FramePass.inl +++ b/include/Nazara/Graphics/FramePass.inl @@ -8,12 +8,11 @@ namespace Nz { - inline FramePass::FramePass(FrameGraph& owner, std::size_t passId, std::string name) : + inline FramePass::FramePass(FrameGraph& /*owner*/, std::size_t passId, std::string name) : m_depthStencilInput(InvalidAttachmentId), m_depthStencilOutput(InvalidAttachmentId), m_passId(passId), - m_name(std::move(name)), - m_owner(owner) + m_name(std::move(name)) { } diff --git a/include/Nazara/Graphics/InstancedRenderable.inl b/include/Nazara/Graphics/InstancedRenderable.inl index 4fcba5403..224b9e51a 100644 --- a/include/Nazara/Graphics/InstancedRenderable.inl +++ b/include/Nazara/Graphics/InstancedRenderable.inl @@ -9,6 +9,7 @@ namespace Nz { inline InstancedRenderable::InstancedRenderable() : m_aabb(Boxf::Zero()), + m_scissorBox(-1, -1, -1, -1), m_renderLayer(0) { } diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 24b92ab62..867d9c327 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -445,7 +445,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Right)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Right)] = Plane(plane); // Extract the numbers for the LEFT plane plane[0] = viewProjMatrix[3] + viewProjMatrix[0]; @@ -460,7 +460,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Left)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Left)] = Plane(plane); // Extract the BOTTOM plane plane[0] = viewProjMatrix[3] + viewProjMatrix[1]; @@ -475,7 +475,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Bottom)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Bottom)] = Plane(plane); // Extract the TOP plane plane[0] = viewProjMatrix[3] - viewProjMatrix[1]; @@ -490,7 +490,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Top)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Top)] = Plane(plane); // Extract the FAR plane plane[0] = viewProjMatrix[3] - viewProjMatrix[2]; @@ -505,7 +505,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Far)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Far)] = Plane(plane); // Extract the NEAR plane plane[0] = viewProjMatrix[3] + viewProjMatrix[2]; @@ -520,7 +520,7 @@ namespace Nz plane[2] *= invLength; plane[3] *= -invLength; - planes[UnderlyingCast(FrustumPlane::Near)] = Plane(plane); + planes[UnderlyingCast(FrustumPlane::Near)] = Plane(plane); return Frustum(planes); } diff --git a/include/Nazara/Renderer/RenderPassCache.hpp b/include/Nazara/Renderer/RenderPassCache.hpp index 330d9e7cf..36d5f4650 100644 --- a/include/Nazara/Renderer/RenderPassCache.hpp +++ b/include/Nazara/Renderer/RenderPassCache.hpp @@ -29,7 +29,7 @@ namespace Nz const std::shared_ptr& Get(const std::vector& attachments, const std::vector& subpassDescriptions, const std::vector& subpassDependencies) const; RenderPassCache& operator=(const RenderPassCache&) = delete; - RenderPassCache& operator=(RenderPassCache&&) noexcept = default; + RenderPassCache& operator=(RenderPassCache&&) = delete; private: struct RenderPassData diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp index 22e7e9dfa..390c5b9ed 100644 --- a/include/Nazara/Utility/IndexBuffer.hpp +++ b/include/Nazara/Utility/IndexBuffer.hpp @@ -52,8 +52,8 @@ namespace Nz private: std::shared_ptr m_buffer; + UInt32 m_indexCount; UInt64 m_endOffset; - UInt64 m_indexCount; UInt64 m_startOffset; bool m_largeIndices; }; diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp index 603b8d26f..d00a2f6d1 100644 --- a/src/Nazara/Graphics/ForwardFramePipeline.cpp +++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp @@ -777,7 +777,7 @@ namespace Nz forwardPass.AddOutput(renderTargetData.finalAttachment); forwardPass.SetClearColor(0, Color::Black); - forwardPass.SetCommandCallback([this, &targetViewers](CommandBufferBuilder& builder, const Recti& renderRect) + forwardPass.SetCommandCallback([&targetViewers](CommandBufferBuilder& builder, const Recti& renderRect) { builder.SetScissor(renderRect); builder.SetViewport(renderRect);