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

Shader/SpirvWriter: Rename MergeBlocks to MergeSections 

to avoid confusion with SpirV blocks
This commit is contained in:
Jérôme Leclercq 2021-01-03 11:11:54 +01:00
parent 079834ca6a
commit 44bc86d082
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Shader/SpirvWriter.hpp
View File

@ -84,7 +84,7 @@ namespace Nz
void WriteLocalVariable(std::string name, UInt32 resultId); void WriteLocalVariable(std::string name, UInt32 resultId);
static void MergeBlocks(std::vector<UInt32>& output, const SpirvSection& from); static void MergeSections(std::vector<UInt32>& output, const SpirvSection& from);
struct Context struct Context
{ {

12
src/Nazara/Shader/SpirvWriter.cpp
View File

@ -461,11 +461,11 @@ namespace Nz
state.header.Append(SpirvOp::OpExecutionMode, entryFunc.id, SpvExecutionModeOriginUpperLeft); state.header.Append(SpirvOp::OpExecutionMode, entryFunc.id, SpvExecutionModeOriginUpperLeft);
std::vector<UInt32> ret; std::vector<UInt32> ret;
MergeBlocks(ret, state.header); MergeSections(ret, state.header);
MergeBlocks(ret, state.debugInfo); MergeSections(ret, state.debugInfo);
MergeBlocks(ret, state.annotations); MergeSections(ret, state.annotations);
MergeBlocks(ret, state.constants); MergeSections(ret, state.constants);
MergeBlocks(ret, state.instructions); MergeSections(ret, state.instructions);
return ret; return ret;
} }
@ -675,7 +675,7 @@ namespace Nz
m_currentState->varToResult.insert_or_assign(std::move(name), resultId); m_currentState->varToResult.insert_or_assign(std::move(name), resultId);
} }
void SpirvWriter::MergeBlocks(std::vector<UInt32>& output, const SpirvSection& from) void SpirvWriter::MergeSections(std::vector<UInt32>& output, const SpirvSection& from)
{ {
const std::vector<UInt32>& bytecode = from.GetBytecode(); const std::vector<UInt32>& bytecode = from.GetBytecode();