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

Fix compilation

This commit is contained in:
Jérôme Leclercq 2021-09-06 09:45:30 +02:00
parent abdcd63058
commit 7a78e7be8c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/DeferredShading/main.cpp
View File

@ -547,6 +547,7 @@ int main()
std::size_t lightOutput; std::size_t lightOutput;
Nz::SubmeshRenderer submeshRenderer; Nz::SubmeshRenderer submeshRenderer;
std::unique_ptr<Nz::ElementRendererData> submeshRendererData = submeshRenderer.InstanciateData();
std::size_t forwardPassIndex = Nz::Graphics::Instance()->GetMaterialPassRegistry().GetPassIndex("ForwardPass"); std::size_t forwardPassIndex = Nz::Graphics::Instance()->GetMaterialPassRegistry().GetPassIndex("ForwardPass");
@ -655,7 +656,7 @@ int main()
for (const auto& element : elements) for (const auto& element : elements)
elementPointers.emplace_back(element.get()); 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"); Nz::FramePass& lightingPass = graph.AddPass("Lighting pass");

2
src/Nazara/Graphics/SpriteChainRenderer.cpp
View File

@ -199,7 +199,7 @@ namespace Nz
currentDrawCall = &data.drawCalls.back(); currentDrawCall = &data.drawCalls.back();
} }
std::size_t remainingSpace = m_maxVertexBufferSize - (currentAllocationMemPtr - currentAllocation->mappedPtr); std::size_t remainingSpace = m_maxVertexBufferSize - (currentAllocationMemPtr - static_cast<UInt8*>(currentAllocation->mappedPtr));
std::size_t maxQuads = remainingSpace / (4 * stride); std::size_t maxQuads = remainingSpace / (4 * stride);
if (maxQuads == 0) if (maxQuads == 0)
{ {