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

Shader: Rename Parse function to ParseFromFile 

to avoid ambiguous calls when passing const char*
This commit is contained in:
Jérôme Leclercq 2021-12-23 17:18:30 +01:00
parent e497faabaf
commit e2882f6595
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/DeferredShading/main.cpp
View File

@ -180,8 +180,8 @@ int main()
auto customSettings = Nz::BasicMaterial::GetSettings()->GetBuilderData(); auto customSettings = Nz::BasicMaterial::GetSettings()->GetBuilderData();
customSettings.shaders.clear(); customSettings.shaders.clear();
customSettings.shaders.emplace_back(std::make_shared<Nz::UberShader>(Nz::ShaderStageType::Fragment, Nz::ShaderLang::Parse(resourceDir / "deferred_frag.nzsl"))); customSettings.shaders.emplace_back(std::make_shared<Nz::UberShader>(Nz::ShaderStageType::Fragment, Nz::ShaderLang::ParseFromFile(resourceDir / "deferred_frag.nzsl")));
customSettings.shaders.emplace_back(std::make_shared<Nz::UberShader>(Nz::ShaderStageType::Vertex, Nz::ShaderLang::Parse(resourceDir / "deferred_vert.nzsl"))); customSettings.shaders.emplace_back(std::make_shared<Nz::UberShader>(Nz::ShaderStageType::Vertex, Nz::ShaderLang::ParseFromFile(resourceDir / "deferred_vert.nzsl")));
auto customMatSettings = std::make_shared<Nz::MaterialSettings>(std::move(customSettings)); auto customMatSettings = std::make_shared<Nz::MaterialSettings>(std::move(customSettings));

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

@ -134,7 +134,7 @@ namespace Nz::ShaderLang
inline ShaderAst::StatementPtr Parse(const std::string_view& source); inline ShaderAst::StatementPtr Parse(const std::string_view& source);
inline ShaderAst::StatementPtr Parse(const std::vector<Token>& tokens); inline ShaderAst::StatementPtr Parse(const std::vector<Token>& tokens);
NAZARA_SHADER_API ShaderAst::StatementPtr Parse(const std::filesystem::path& sourcePath); NAZARA_SHADER_API ShaderAst::StatementPtr ParseFromFile(const std::filesystem::path& sourcePath);
} }
#include <Nazara/Shader/ShaderLangParser.inl> #include <Nazara/Shader/ShaderLangParser.inl>

2
src/Nazara/Shader/ShaderLangParser.cpp
View File

@ -1257,7 +1257,7 @@ namespace Nz::ShaderLang
} }
} }
ShaderAst::StatementPtr Parse(const std::filesystem::path& sourcePath) ShaderAst::StatementPtr ParseFromFile(const std::filesystem::path& sourcePath)
{ {
File file(sourcePath); File file(sourcePath);
if (!file.Open(OpenMode::ReadOnly | OpenMode::Text)) if (!file.Open(OpenMode::ReadOnly | OpenMode::Text))