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

Refactor SpirV classes

Browse Source 
SpirvStatementVisitor was merged with SpirvExpressionLoad
SpirvExpressionLoadAccessMember was renamed SpirvExpressionLoad
This commit is contained in:
Jérôme Leclercq
2020-08-23 21:56:30 +02:00
parent 6c379eff68
commit 77b66620c9
12 changed files with 591 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,10 +7,10 @@
#include <Nazara/Core/StackVector.hpp>
#include <Nazara/Shader/ShaderAstCloner.hpp>
#include <Nazara/Shader/ShaderAstValidator.hpp>
#include <Nazara/Shader/SpirvAstVisitor.hpp>
#include <Nazara/Shader/SpirvConstantCache.hpp>
#include <Nazara/Shader/SpirvData.hpp>
#include <Nazara/Shader/SpirvSection.hpp>
#include <Nazara/Shader/SpirvStatementVisitor.hpp>
#include <tsl/ordered_map.h>
#include <tsl/ordered_set.h>
#include <SpirV/spirv.h>
@@ -380,7 +380,7 @@ namespace Nz
state.instructions.Append(SpirvOp::OpFunctionParameter, GetTypeId(param.type), paramResultId);
}
SpirvStatementVisitor visitor(*this);
SpirvAstVisitor visitor(*this);
visitor.Visit(functionStatements[funcIndex]);
if (func.returnType == ShaderNodes::BasicType::Void)