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

Shader/ShaderWrite: Add optimize bool

Browse Source
This commit is contained in:
Lynix
2021-05-16 23:08:36 +02:00
parent 525f24af2e
commit 61d082e61b
6 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Nazara/Shader/GlslWriter.cpp
View File

@@ -8,6 +8,7 @@
#include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Shader/ShaderBuilder.hpp>
#include <Nazara/Shader/Ast/AstCloner.hpp>
#include <Nazara/Shader/Ast/AstOptimizer.hpp>
#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
#include <Nazara/Shader/Ast/AstUtils.hpp>
#include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
@@ -122,10 +123,21 @@ namespace Nz
ShaderAst::StatementPtr sanitizedAst = ShaderAst::Sanitize(shader, options);
ShaderAst::StatementPtr* targetAstPtr = &sanitizedAst;
ShaderAst::StatementPtr optimizedAst;
if (states.optimize)
{
optimizedAst = ShaderAst::Optimize(*targetAstPtr);
targetAstPtr = &optimizedAst;
}
ShaderAst::StatementPtr& targetAst = *targetAstPtr;
PreVisitor previsitor;
previsitor.enabledOptions = states.enabledOptions;
previsitor.selectedStage = shaderStage;
sanitizedAst->Visit(previsitor);
targetAst->Visit(previsitor);
if (!previsitor.entryPoint)
throw std::runtime_error("missing entry point");
@@ -167,7 +179,7 @@ namespace Nz
}
}
void GlslWriter::Append(const ShaderAst::IdentifierType& identifierType)
void GlslWriter::Append(const ShaderAst::IdentifierType& /*identifierType*/)
{
throw std::runtime_error("unexpected identifier type");
}
@@ -230,7 +242,7 @@ namespace Nz
Append(structDesc.name);
}
void GlslWriter::Append(const ShaderAst::UniformType& uniformType)
void GlslWriter::Append(const ShaderAst::UniformType& /*uniformType*/)
{
throw std::runtime_error("unexpected UniformType");
}
@@ -734,7 +746,7 @@ namespace Nz
LeaveScope();
}
void GlslWriter::Visit(ShaderAst::DeclareOptionStatement& node)
void GlslWriter::Visit(ShaderAst::DeclareOptionStatement& /*node*/)
{
/* nothing to do */
}

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

@@ -11,6 +11,7 @@
#include <Nazara/Shader/SpirvData.hpp>
#include <Nazara/Shader/SpirvSection.hpp>
#include <Nazara/Shader/Ast/AstCloner.hpp>
#include <Nazara/Shader/Ast/AstOptimizer.hpp>
#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
#include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
#include <tsl/ordered_map.h>
@@ -401,11 +402,23 @@ namespace Nz
std::vector<UInt32> SpirvWriter::Generate(ShaderAst::StatementPtr& shader, const States& states)
{
ShaderAst::StatementPtr* targetAstPtr = &shader;
ShaderAst::StatementPtr sanitizedAst;
if (!states.sanitized)
{
sanitizedAst = ShaderAst::Sanitize(shader);
targetAstPtr = &sanitizedAst;
}
ShaderAst::StatementPtr& targetAst = (states.sanitized) ? shader : sanitizedAst;
ShaderAst::StatementPtr optimizedAst;
if (states.optimize)
{
optimizedAst = ShaderAst::Optimize(*targetAstPtr);
targetAstPtr = &optimizedAst;
}
ShaderAst::StatementPtr& targetAst = *targetAstPtr;
m_context.states = &states;