From 14fb2b83aebb58309b88999b06eccb9aefeb7f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 25 Oct 2021 15:48:49 +0200 Subject: [PATCH] Minor fixes --- include/Nazara/Shader/SpirvSectionBase.inl | 2 +- src/Nazara/Graphics/ForwardFramePipeline.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Shader/SpirvSectionBase.inl b/include/Nazara/Shader/SpirvSectionBase.inl index 760bfea6b..8c930e9b2 100644 --- a/include/Nazara/Shader/SpirvSectionBase.inl +++ b/include/Nazara/Shader/SpirvSectionBase.inl @@ -12,7 +12,7 @@ namespace Nz return AppendRaw(BuildOpcode(opcode, wordCount.wc)); } - template + template std::size_t SpirvSectionBase::Append(SpirvOp opcode, const Args&... args) { unsigned int wordCount = 1 + (CountWord(args) + ... + 0); diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp index 6d44ee007..9ad4bcf43 100644 --- a/src/Nazara/Graphics/ForwardFramePipeline.cpp +++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp @@ -131,6 +131,8 @@ namespace Nz // Update UBOs and materials UploadPool& uploadPool = renderFrame.GetUploadPool(); + bool prepare = false; + renderFrame.Execute([&](CommandBufferBuilder& builder) { builder.BeginDebugRegion("UBO Update", Color::Yellow); @@ -155,6 +157,7 @@ namespace Nz { viewerData.rebuildDepthPrepass = true; viewerData.rebuildForwardPass = true; + prepare = true; } } } @@ -171,7 +174,6 @@ namespace Nz }; // Render queues handling - bool prepare = false; for (auto&& [viewer, data] : m_viewers) { auto& viewerData = data;