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

Replace const ShaderAst::StatementPtr& by ShaderAst::Statement& in input

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-06-14 22:31:12 +02:00
parent 54d56abc56
commit 815a7b0c62
27 changed files with 101 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/RenderDevice.hpp
View File

@@ -43,7 +43,7 @@ namespace Nz
virtual std::shared_ptr<RenderPass> InstantiateRenderPass(std::vector<RenderPass::Attachment> attachments, std::vector<RenderPass::SubpassDescription> subpassDescriptions, std::vector<RenderPass::SubpassDependency> subpassDependencies) = 0;
virtual std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) = 0;
virtual std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) = 0;
virtual std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags shaderStages, ShaderAst::StatementPtr& shaderAst, const ShaderWriter::States& states) = 0;
virtual std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags shaderStages, ShaderAst::Statement& shaderAst, const ShaderWriter::States& states) = 0;
virtual std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const ShaderWriter::States& states) = 0;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const std::filesystem::path& sourcePath, const ShaderWriter::States& states);
virtual std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) = 0;

8
include/Nazara/Shader/Ast/AstCloner.hpp
View File

@@ -23,8 +23,8 @@ namespace Nz::ShaderAst
AstCloner(AstCloner&&) = delete;
~AstCloner() = default;
ExpressionPtr Clone(const ExpressionPtr& statement);
StatementPtr Clone(const StatementPtr& statement);
ExpressionPtr Clone(Expression& statement);
StatementPtr Clone(Statement& statement);
AstCloner& operator=(const AstCloner&) = delete;
AstCloner& operator=(AstCloner&&) = delete;
@@ -79,8 +79,8 @@ namespace Nz::ShaderAst
std::vector<StatementPtr> m_statementStack;
};
inline ExpressionPtr Clone(ExpressionPtr& node);
inline StatementPtr Clone(StatementPtr& node);
inline ExpressionPtr Clone(Expression& node);
inline StatementPtr Clone(Statement& node);
}
#include <Nazara/Shader/Ast/AstCloner.inl>

4
include/Nazara/Shader/Ast/AstCloner.inl
View File

@@ -23,13 +23,13 @@ namespace Nz::ShaderAst
return CloneStatement(*statement);
}
inline ExpressionPtr Clone(ExpressionPtr& node)
inline ExpressionPtr Clone(Expression& node)
{
AstCloner cloner;
return cloner.Clone(node);
}
inline StatementPtr Clone(StatementPtr& node)
inline StatementPtr Clone(Statement& node)
{
AstCloner cloner;
return cloner.Clone(node);

8
include/Nazara/Shader/Ast/AstOptimizer.hpp
View File

@@ -23,8 +23,8 @@ namespace Nz::ShaderAst
AstOptimizer(AstOptimizer&&) = delete;
~AstOptimizer() = default;
StatementPtr Optimise(const StatementPtr& statement);
StatementPtr Optimise(const StatementPtr& statement, UInt64 enabledConditions);
StatementPtr Optimise(Statement& statement);
StatementPtr Optimise(Statement& statement, UInt64 enabledConditions);
AstOptimizer& operator=(const AstOptimizer&) = delete;
AstOptimizer& operator=(AstOptimizer&&) = delete;
@@ -48,8 +48,8 @@ namespace Nz::ShaderAst
std::optional<UInt64> m_enabledOptions;
};
inline StatementPtr Optimize(const StatementPtr& ast);
inline StatementPtr Optimize(const StatementPtr& ast, UInt64 enabledConditions);
inline StatementPtr Optimize(Statement& ast);
inline StatementPtr Optimize(Statement& ast, UInt64 enabledConditions);
}
#include <Nazara/Shader/Ast/AstOptimizer.inl>

4
include/Nazara/Shader/Ast/AstOptimizer.inl
View File

@@ -7,13 +7,13 @@
namespace Nz::ShaderAst
{
inline StatementPtr Optimize(const StatementPtr& ast)
inline StatementPtr Optimize(Statement& ast)
{
AstOptimizer optimize;
return optimize.Optimise(ast);
}
inline StatementPtr Optimize(const StatementPtr& ast, UInt64 enabledConditions)
inline StatementPtr Optimize(Statement& ast, UInt64 enabledConditions)
{
AstOptimizer optimize;
return optimize.Optimise(ast, enabledConditions);

2
include/Nazara/Shader/Ast/AstReflect.hpp
View File

@@ -24,7 +24,7 @@ namespace Nz::ShaderAst
AstReflect(AstReflect&&) = delete;
~AstReflect() = default;
void Reflect(const StatementPtr& statement, const Callbacks& callbacks);
void Reflect(Statement& statement, const Callbacks& callbacks);
AstReflect& operator=(const AstReflect&) = delete;
AstReflect& operator=(AstReflect&&) = delete;

10
include/Nazara/Shader/Ast/SanitizeVisitor.hpp
View File

@@ -27,8 +27,8 @@ namespace Nz::ShaderAst
SanitizeVisitor(SanitizeVisitor&&) = delete;
~SanitizeVisitor() = default;
inline StatementPtr Sanitize(const StatementPtr& statement, std::string* error = nullptr);
StatementPtr Sanitize(const StatementPtr& statement, const Options& options, std::string* error = nullptr);
inline StatementPtr Sanitize(Statement& statement, std::string* error = nullptr);
StatementPtr Sanitize(Statement& statement, const Options& options, std::string* error = nullptr);
SanitizeVisitor& operator=(const SanitizeVisitor&) = delete;
SanitizeVisitor& operator=(SanitizeVisitor&&) = delete;
@@ -80,7 +80,7 @@ namespace Nz::ShaderAst
void PushScope();
void PopScope();
std::size_t DeclareFunction(DeclareFunctionStatement* funcDecl);
std::size_t DeclareFunction(DeclareFunctionStatement& funcDecl);
void PropagateFunctionFlags(std::size_t funcIndex, FunctionFlags flags, Bitset<>& seen);
@@ -141,8 +141,8 @@ namespace Nz::ShaderAst
Context* m_context;
};
inline StatementPtr Sanitize(const StatementPtr& ast, std::string* error = nullptr);
inline StatementPtr Sanitize(const StatementPtr& ast, const SanitizeVisitor::Options& options, std::string* error = nullptr);
inline StatementPtr Sanitize(Statement& ast, std::string* error = nullptr);
inline StatementPtr Sanitize(Statement& ast, const SanitizeVisitor::Options& options, std::string* error = nullptr);
}
#include <Nazara/Shader/Ast/SanitizeVisitor.inl>

6
include/Nazara/Shader/Ast/SanitizeVisitor.inl
View File

@@ -7,7 +7,7 @@
namespace Nz::ShaderAst
{
inline StatementPtr SanitizeVisitor::Sanitize(const StatementPtr& statement, std::string* error)
inline StatementPtr SanitizeVisitor::Sanitize(Statement& statement, std::string* error)
{
return Sanitize(statement, {}, error);
}
@@ -21,13 +21,13 @@ namespace Nz::ShaderAst
return &*it;
}
inline StatementPtr Sanitize(const StatementPtr& ast, std::string* error)
inline StatementPtr Sanitize(Statement& ast, std::string* error)
{
SanitizeVisitor sanitizer;
return sanitizer.Sanitize(ast, error);
}
inline StatementPtr Sanitize(const StatementPtr& ast, const SanitizeVisitor::Options& options, std::string* error)
inline StatementPtr Sanitize(Statement& ast, const SanitizeVisitor::Options& options, std::string* error)
{
SanitizeVisitor sanitizer;
return sanitizer.Sanitize(ast, options, error);

5
include/Nazara/Shader/GlslWriter.hpp
View File

@@ -30,8 +30,8 @@ namespace Nz
GlslWriter(GlslWriter&&) = delete;
~GlslWriter() = default;
inline std::string Generate(ShaderAst::StatementPtr& shader, const States& states = {});
std::string Generate(std::optional<ShaderStageType> shaderStage, ShaderAst::StatementPtr& shader, const States& states = {});
inline std::string Generate(ShaderAst::Statement& shader, const States& states = {});
std::string Generate(std::optional<ShaderStageType> shaderStage, ShaderAst::Statement& shader, const States& states = {});
void SetEnv(Environment environment);
@@ -45,6 +45,7 @@ namespace Nz
};
static const char* GetFlipYUniformName();
static ShaderAst::StatementPtr Sanitize(ShaderAst::Statement& ast, std::string* error = nullptr);
private:
void Append(const ShaderAst::ExpressionType& type);

2
include/Nazara/Shader/GlslWriter.inl
View File

@@ -12,7 +12,7 @@ namespace Nz
{
}
inline std::string GlslWriter::Generate(ShaderAst::StatementPtr& shader, const States& states)
inline std::string GlslWriter::Generate(ShaderAst::Statement& shader, const States& states)
{
return Generate(std::nullopt, shader, states);
}

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

@@ -28,7 +28,7 @@ namespace Nz
LangWriter(LangWriter&&) = delete;
~LangWriter() = default;
std::string Generate(ShaderAst::StatementPtr& shader, const States& conditions = {});
std::string Generate(ShaderAst::Statement& shader, const States& conditions = {});
void SetEnv(Environment environment);

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

@@ -36,7 +36,7 @@ namespace Nz
SpirvWriter(SpirvWriter&&) = delete;
~SpirvWriter() = default;
std::vector<UInt32> Generate(ShaderAst::StatementPtr& shader, const States& states = {});
std::vector<UInt32> Generate(ShaderAst::Statement& shader, const States& states = {});
void SetEnv(Environment environment);

2
include/Nazara/VulkanRenderer/VulkanDevice.hpp
View File

@@ -31,7 +31,7 @@ namespace Nz
std::shared_ptr<RenderPass> InstantiateRenderPass(std::vector<RenderPass::Attachment> attachments, std::vector<RenderPass::SubpassDescription> subpassDescriptions, std::vector<RenderPass::SubpassDependency> subpassDependencies) override;
std::shared_ptr<RenderPipeline> InstantiateRenderPipeline(RenderPipelineInfo pipelineInfo) override;
std::shared_ptr<RenderPipelineLayout> InstantiateRenderPipelineLayout(RenderPipelineLayoutInfo pipelineLayoutInfo) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderAst::StatementPtr& shaderAst, const ShaderWriter::States& states) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderAst::Statement& shaderAst, const ShaderWriter::States& states) override;
std::shared_ptr<ShaderModule> InstantiateShaderModule(ShaderStageTypeFlags stages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const ShaderWriter::States& states) override;
std::shared_ptr<Texture> InstantiateTexture(const TextureInfo& params) override;
std::shared_ptr<TextureSampler> InstantiateTextureSampler(const TextureSamplerInfo& params) override;

2
include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
View File

@@ -27,7 +27,7 @@ namespace Nz
VulkanShaderModule(VulkanShaderModule&&) = delete;
~VulkanShaderModule() = default;
bool Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderAst::StatementPtr& shaderAst, const ShaderWriter::States& states);
bool Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderAst::Statement& shaderAst, const ShaderWriter::States& states);
bool Create(Vk::Device& device, ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const ShaderWriter::States& states);
inline const Vk::ShaderModule& GetHandle() const;