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

Shader/Spirv: Put types and constants in the same section

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-08-21 22:51:11 +02:00
parent cd23c01ace
commit 66a14721cb
3 changed files with 151 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,6 @@ namespace Nz
SpirvSection constants;
SpirvSection debugInfo;
SpirvSection annotations;
SpirvSection types;
SpirvSection instructions;
};
@@ -398,7 +397,7 @@ namespace Nz
assert(entryPointIndex != std::numeric_limits<std::size_t>::max());
m_currentState->constantTypeCache.Write(m_currentState->annotations, m_currentState->constants, m_currentState->debugInfo, m_currentState->types);
m_currentState->constantTypeCache.Write(m_currentState->annotations, m_currentState->constants, m_currentState->debugInfo);
AppendHeader();
@@ -446,7 +445,6 @@ namespace Nz
MergeBlocks(ret, state.header);
MergeBlocks(ret, state.debugInfo);
MergeBlocks(ret, state.annotations);
MergeBlocks(ret, state.types);
MergeBlocks(ret, state.constants);
MergeBlocks(ret, state.instructions);