From 44bc86d08234596fa58ce707f328f1d90423440e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 3 Jan 2021 11:11:54 +0100 Subject: [PATCH] Shader/SpirvWriter: Rename MergeBlocks to MergeSections to avoid confusion with SpirV blocks --- include/Nazara/Shader/SpirvWriter.hpp | 2 +- src/Nazara/Shader/SpirvWriter.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/Nazara/Shader/SpirvWriter.hpp b/include/Nazara/Shader/SpirvWriter.hpp index 86f3f156b..62227ea4e 100644 --- a/include/Nazara/Shader/SpirvWriter.hpp +++ b/include/Nazara/Shader/SpirvWriter.hpp @@ -84,7 +84,7 @@ namespace Nz void WriteLocalVariable(std::string name, UInt32 resultId); - static void MergeBlocks(std::vector& output, const SpirvSection& from); + static void MergeSections(std::vector& output, const SpirvSection& from); struct Context { diff --git a/src/Nazara/Shader/SpirvWriter.cpp b/src/Nazara/Shader/SpirvWriter.cpp index 535d53297..0e1af9c0b 100644 --- a/src/Nazara/Shader/SpirvWriter.cpp +++ b/src/Nazara/Shader/SpirvWriter.cpp @@ -461,11 +461,11 @@ namespace Nz state.header.Append(SpirvOp::OpExecutionMode, entryFunc.id, SpvExecutionModeOriginUpperLeft); std::vector ret; - MergeBlocks(ret, state.header); - MergeBlocks(ret, state.debugInfo); - MergeBlocks(ret, state.annotations); - MergeBlocks(ret, state.constants); - MergeBlocks(ret, state.instructions); + MergeSections(ret, state.header); + MergeSections(ret, state.debugInfo); + MergeSections(ret, state.annotations); + MergeSections(ret, state.constants); + MergeSections(ret, state.instructions); return ret; } @@ -675,7 +675,7 @@ namespace Nz m_currentState->varToResult.insert_or_assign(std::move(name), resultId); } - void SpirvWriter::MergeBlocks(std::vector& output, const SpirvSection& from) + void SpirvWriter::MergeSections(std::vector& output, const SpirvSection& from) { const std::vector& bytecode = from.GetBytecode();