diff --git a/examples/DeferredShading/main.cpp b/examples/DeferredShading/main.cpp index dda72e570..6726995b7 100644 --- a/examples/DeferredShading/main.cpp +++ b/examples/DeferredShading/main.cpp @@ -180,8 +180,8 @@ int main() auto customSettings = Nz::BasicMaterial::GetSettings()->GetBuilderData(); customSettings.shaders.clear(); - customSettings.shaders.emplace_back(std::make_shared(Nz::ShaderStageType::Fragment, Nz::ShaderLang::Parse(resourceDir / "deferred_frag.nzsl"))); - customSettings.shaders.emplace_back(std::make_shared(Nz::ShaderStageType::Vertex, Nz::ShaderLang::Parse(resourceDir / "deferred_vert.nzsl"))); + customSettings.shaders.emplace_back(std::make_shared(Nz::ShaderStageType::Fragment, Nz::ShaderLang::ParseFromFile(resourceDir / "deferred_frag.nzsl"))); + customSettings.shaders.emplace_back(std::make_shared(Nz::ShaderStageType::Vertex, Nz::ShaderLang::ParseFromFile(resourceDir / "deferred_vert.nzsl"))); auto customMatSettings = std::make_shared(std::move(customSettings)); diff --git a/include/Nazara/Shader/ShaderLangParser.hpp b/include/Nazara/Shader/ShaderLangParser.hpp index cb6ebd471..2baf10954 100644 --- a/include/Nazara/Shader/ShaderLangParser.hpp +++ b/include/Nazara/Shader/ShaderLangParser.hpp @@ -134,7 +134,7 @@ namespace Nz::ShaderLang inline ShaderAst::StatementPtr Parse(const std::string_view& source); inline ShaderAst::StatementPtr Parse(const std::vector& tokens); - NAZARA_SHADER_API ShaderAst::StatementPtr Parse(const std::filesystem::path& sourcePath); + NAZARA_SHADER_API ShaderAst::StatementPtr ParseFromFile(const std::filesystem::path& sourcePath); } #include diff --git a/src/Nazara/Shader/ShaderLangParser.cpp b/src/Nazara/Shader/ShaderLangParser.cpp index 674de3995..292bbc209 100644 --- a/src/Nazara/Shader/ShaderLangParser.cpp +++ b/src/Nazara/Shader/ShaderLangParser.cpp @@ -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); if (!file.Open(OpenMode::ReadOnly | OpenMode::Text))