From 7a78e7be8c16068238594bf9c02a5556b9a4239b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 6 Sep 2021 09:45:30 +0200 Subject: [PATCH] Fix compilation --- examples/DeferredShading/main.cpp | 3 ++- src/Nazara/Graphics/SpriteChainRenderer.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/DeferredShading/main.cpp b/examples/DeferredShading/main.cpp index d45a8bbcf..accfa12b4 100644 --- a/examples/DeferredShading/main.cpp +++ b/examples/DeferredShading/main.cpp @@ -547,6 +547,7 @@ int main() std::size_t lightOutput; Nz::SubmeshRenderer submeshRenderer; + std::unique_ptr submeshRendererData = submeshRenderer.InstanciateData(); std::size_t forwardPassIndex = Nz::Graphics::Instance()->GetMaterialPassRegistry().GetPassIndex("ForwardPass"); @@ -655,7 +656,7 @@ int main() for (const auto& element : elements) elementPointers.emplace_back(element.get()); - submeshRenderer.Render(builder, elementPointers.data(), elementPointers.size()); + submeshRenderer.Render(*submeshRendererData, builder, elementPointers.data(), elementPointers.size()); }); Nz::FramePass& lightingPass = graph.AddPass("Lighting pass"); diff --git a/src/Nazara/Graphics/SpriteChainRenderer.cpp b/src/Nazara/Graphics/SpriteChainRenderer.cpp index 2b91e1a62..ba4aadeef 100644 --- a/src/Nazara/Graphics/SpriteChainRenderer.cpp +++ b/src/Nazara/Graphics/SpriteChainRenderer.cpp @@ -199,7 +199,7 @@ namespace Nz currentDrawCall = &data.drawCalls.back(); } - std::size_t remainingSpace = m_maxVertexBufferSize - (currentAllocationMemPtr - currentAllocation->mappedPtr); + std::size_t remainingSpace = m_maxVertexBufferSize - (currentAllocationMemPtr - static_cast(currentAllocation->mappedPtr)); std::size_t maxQuads = remainingSpace / (4 * stride); if (maxQuads == 0) {