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

Shader: Add SourceLocation members

Browse Source 
TODO: Fill from Parser and use them for error throwing in SanitizeVisitor
This commit is contained in:
SirLynix
2022-03-27 14:06:58 +02:00
committed by Jérôme Leclercq
parent b8bf19f8cd
commit 960ab64d98
15 changed files with 329 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/Nazara/Shader/Ast/Nodes.hpp
View File

@@ -12,6 +12,7 @@
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Math/Vector4.hpp>
#include <Nazara/Shader/Config.hpp>
#include <Nazara/Shader/ShaderLangSourceLocation.hpp>
#include <Nazara/Shader/Ast/Attribute.hpp>
#include <Nazara/Shader/Ast/ConstantValue.hpp>
#include <Nazara/Shader/Ast/Enums.hpp>
@@ -41,6 +42,8 @@ namespace Nz::ShaderAst
Node& operator=(const Node&) = delete;
Node& operator=(Node&&) noexcept = default;
ShaderLang::SourceLocation sourceLocation;
};
// Expressions
@@ -69,7 +72,13 @@ namespace Nz::ShaderAst
NodeType GetType() const override;
void Visit(AstExpressionVisitor& visitor) override;
std::vector<std::string> identifiers;
struct Identifier
{
std::string identifier;
ShaderLang::SourceLocation sourceLocation;
};
std::vector<Identifier> identifiers;
ExpressionPtr expr;
};
@@ -317,6 +326,7 @@ namespace Nz::ShaderAst
ExpressionValue<UInt32> bindingIndex;
ExpressionValue<UInt32> bindingSet;
ExpressionValue<ExpressionType> type;
ShaderLang::SourceLocation sourceLocation;
};
std::vector<ExternalVar> externalVars;
@@ -330,9 +340,10 @@ namespace Nz::ShaderAst
struct Parameter
{
ExpressionValue<ExpressionType> type;
std::optional<std::size_t> varIndex;
std::string name;
ExpressionValue<ExpressionType> type;
ShaderLang::SourceLocation sourceLocation;
};
std::optional<std::size_t> funcIndex;