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

Shader: Add EliminateUnusedPassVisitor and use it when optimizing

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-02-18 13:06:47 +01:00
parent ebd1318512
commit 3f7815175b
12 changed files with 407 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
#include <Nazara/Shader/Ast/AstCloner.hpp>
#include <Nazara/Shader/Ast/AstOptimizer.hpp>
#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
#include <Nazara/Shader/Ast/EliminateUnusedPassVisitor.hpp>
#include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
#include <SpirV/GLSL.std.450.h>
#include <tsl/ordered_map.h>
@@ -137,8 +138,6 @@ namespace Nz
void Visit(ShaderAst::DeclareExternalStatement& node) override
{
assert(node.varIndex);
std::size_t varIndex = *node.varIndex;
for (auto& extVar : node.externalVars)
{
SpirvConstantCache::Variable variable;
@@ -165,7 +164,8 @@ namespace Nz
assert(extVar.bindingIndex.IsResultingValue());
UniformVar& uniformVar = extVars[varIndex++];
assert(extVar.varIndex);
UniformVar& uniformVar = extVars[*extVar.varIndex];
uniformVar.pointerId = m_constantCache.Register(variable);
uniformVar.bindingIndex = extVar.bindingIndex.GetResultingValue();
uniformVar.descriptorSet = (extVar.bindingSet.HasValue()) ? extVar.bindingSet.GetResultingValue() : 0;
@@ -519,7 +519,11 @@ namespace Nz
ShaderAst::StatementPtr optimizedAst;
if (states.optimize)
{
optimizedAst = ShaderAst::Optimize(*targetAst);
ShaderAst::StatementPtr tempAst;
tempAst = ShaderAst::Optimize(*targetAst);
optimizedAst = ShaderAst::EliminateUnusedPass(*tempAst);
targetAst = optimizedAst.get();
}