From 601ed047baa95f5ad6e3607612592e728653b3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 24 Sep 2021 15:24:21 +0200 Subject: [PATCH] Fix some initialization order --- include/Nazara/Graphics/RenderSpriteChain.inl | 2 +- include/Nazara/Graphics/RenderSubmesh.inl | 2 +- include/Nazara/OpenGLRenderer/OpenGLUploadPool.inl | 4 ++-- include/Nazara/Shader/SpirvExpressionLoad.inl | 4 ++-- include/Nazara/Shader/SpirvExpressionStore.inl | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/Nazara/Graphics/RenderSpriteChain.inl b/include/Nazara/Graphics/RenderSpriteChain.inl index e9a506169..5576967a6 100644 --- a/include/Nazara/Graphics/RenderSpriteChain.inl +++ b/include/Nazara/Graphics/RenderSpriteChain.inl @@ -15,8 +15,8 @@ namespace Nz m_spriteCount(spriteCount), m_spriteData(spriteData), m_matFlags(matFlags), - m_worldInstance(worldInstance), m_materialBinding(materialBinding), + m_worldInstance(worldInstance), m_renderLayer(renderLayer) { } diff --git a/include/Nazara/Graphics/RenderSubmesh.inl b/include/Nazara/Graphics/RenderSubmesh.inl index 5eafe3731..860793541 100644 --- a/include/Nazara/Graphics/RenderSubmesh.inl +++ b/include/Nazara/Graphics/RenderSubmesh.inl @@ -14,8 +14,8 @@ namespace Nz m_renderPipeline(std::move(renderPipeline)), m_indexCount(indexCount), m_matFlags(matFlags), - m_worldInstance(worldInstance), m_materialBinding(materialBinding), + m_worldInstance(worldInstance), m_renderLayer(renderLayer) { } diff --git a/include/Nazara/OpenGLRenderer/OpenGLUploadPool.inl b/include/Nazara/OpenGLRenderer/OpenGLUploadPool.inl index 2eb508b5b..e684ed832 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLUploadPool.inl +++ b/include/Nazara/OpenGLRenderer/OpenGLUploadPool.inl @@ -8,8 +8,8 @@ namespace Nz { inline OpenGLUploadPool::OpenGLUploadPool(UInt64 blockSize) : - m_blockSize(blockSize), - m_nextAllocationIndex(0) + m_nextAllocationIndex(0), + m_blockSize(blockSize) { } } diff --git a/include/Nazara/Shader/SpirvExpressionLoad.inl b/include/Nazara/Shader/SpirvExpressionLoad.inl index 1522515b9..32ba80eea 100644 --- a/include/Nazara/Shader/SpirvExpressionLoad.inl +++ b/include/Nazara/Shader/SpirvExpressionLoad.inl @@ -8,9 +8,9 @@ namespace Nz { inline SpirvExpressionLoad::SpirvExpressionLoad(SpirvWriter& writer, SpirvAstVisitor& visitor, SpirvBlock& block) : + m_visitor(visitor), m_block(block), - m_writer(writer), - m_visitor(visitor) + m_writer(writer) { } } diff --git a/include/Nazara/Shader/SpirvExpressionStore.inl b/include/Nazara/Shader/SpirvExpressionStore.inl index 16326a438..52e1790b1 100644 --- a/include/Nazara/Shader/SpirvExpressionStore.inl +++ b/include/Nazara/Shader/SpirvExpressionStore.inl @@ -8,9 +8,9 @@ namespace Nz { inline SpirvExpressionStore::SpirvExpressionStore(SpirvWriter& writer, SpirvAstVisitor& visitor, SpirvBlock& block) : + m_visitor(visitor), m_block(block), - m_writer(writer), - m_visitor(visitor) + m_writer(writer) { } }