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

Shader: Change module system (no longer based on path)

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-03-13 15:07:43 +01:00
parent 80f9556f8c
commit e40e8eb204
40 changed files with 224 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Shader/Ast/AstCompare.inl
View File

@@ -56,6 +56,9 @@ namespace Nz::ShaderAst
if (!Compare(lhs.moduleId, rhs.moduleId))
return false;
if (!Compare(lhs.moduleName, rhs.moduleName))
return false;
if (!Compare(lhs.shaderLangVersion, rhs.shaderLangVersion))
return false;
@@ -601,7 +604,7 @@ namespace Nz::ShaderAst
bool Compare(const ImportStatement& lhs, const ImportStatement& rhs)
{
if (!Compare(lhs.modulePath, rhs.modulePath))
if (!Compare(lhs.moduleName, rhs.moduleName))
return false;
return true;

3
include/Nazara/Shader/Ast/Module.hpp
View File

@@ -25,7 +25,7 @@ namespace Nz::ShaderAst
struct ImportedModule;
struct Metadata;
inline Module(UInt32 shaderLangVersion, const Uuid& moduleId = Uuid::Generate());
inline Module(UInt32 shaderLangVersion, std::string moduleName, const Uuid& moduleId = Uuid::Generate());
inline Module(std::shared_ptr<const Metadata> metadata, std::vector<ImportedModule> importedModules = {});
inline Module(std::shared_ptr<const Metadata> metadata, MultiStatementPtr rootNode, std::vector<ImportedModule> importedModules = {});
Module(const Module&) = default;
@@ -43,6 +43,7 @@ namespace Nz::ShaderAst
struct Metadata
{
std::string moduleName;
UInt32 shaderLangVersion;
Uuid moduleId;
};

3
include/Nazara/Shader/Ast/Module.inl
View File

@@ -8,10 +8,11 @@
namespace Nz::ShaderAst
{
inline Module::Module(UInt32 shaderLangVersion, const Uuid& uuid)
inline Module::Module(UInt32 shaderLangVersion, std::string moduleName, const Uuid& uuid)
{
auto mutMetadata = std::make_shared<Metadata>();
mutMetadata->moduleId = uuid;
mutMetadata->moduleName = std::move(moduleName);
mutMetadata->shaderLangVersion = shaderLangVersion;
metadata = std::move(mutMetadata);

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

@@ -414,7 +414,7 @@ namespace Nz::ShaderAst
NodeType GetType() const override;
void Visit(AstStatementVisitor& visitor) override;
std::vector<std::string> modulePath;
std::string moduleName;
};
struct NAZARA_SHADER_API MultiStatement : Statement