From 06406fc20e77d11e82cac0a029ddab4b593f03a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 15 Mar 2022 13:20:17 +0100 Subject: [PATCH] Shader/FilesystemModuleResolver: Fix RegisterModuleDirectory --- include/Nazara/Shader/FilesystemModuleResolver.hpp | 4 ++-- src/Nazara/Shader/FilesystemModuleResolver.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Nazara/Shader/FilesystemModuleResolver.hpp b/include/Nazara/Shader/FilesystemModuleResolver.hpp index d2ce86ade..3aefd5145 100644 --- a/include/Nazara/Shader/FilesystemModuleResolver.hpp +++ b/include/Nazara/Shader/FilesystemModuleResolver.hpp @@ -24,10 +24,10 @@ namespace Nz FilesystemModuleResolver(FilesystemModuleResolver&&) = default; ~FilesystemModuleResolver() = default; - void RegisterModule(std::filesystem::path realPath); + void RegisterModule(const std::filesystem::path& realPath); void RegisterModule(std::string_view moduleSource); void RegisterModule(ShaderAst::ModulePtr module); - void RegisterModuleDirectory(std::filesystem::path realPath); + void RegisterModuleDirectory(const std::filesystem::path& realPath); ShaderAst::ModulePtr Resolve(const std::string& moduleName) override; diff --git a/src/Nazara/Shader/FilesystemModuleResolver.cpp b/src/Nazara/Shader/FilesystemModuleResolver.cpp index 87e39b6ab..5904e9702 100644 --- a/src/Nazara/Shader/FilesystemModuleResolver.cpp +++ b/src/Nazara/Shader/FilesystemModuleResolver.cpp @@ -11,7 +11,7 @@ namespace Nz { - void FilesystemModuleResolver::RegisterModule(std::filesystem::path realPath) + void FilesystemModuleResolver::RegisterModule(const std::filesystem::path& realPath) { return RegisterModule(ShaderLang::ParseFromFile(realPath)); } @@ -32,11 +32,11 @@ namespace Nz m_modules.emplace(std::move(moduleName), std::move(module)); } - void FilesystemModuleResolver::RegisterModuleDirectory(std::filesystem::path realPath) + void FilesystemModuleResolver::RegisterModuleDirectory(const std::filesystem::path& realPath) { for (const auto& entry : std::filesystem::recursive_directory_iterator(realPath)) { - if (entry.is_regular_file() && StringEqual(entry.path().extension().generic_u8string(), "nzsl", Nz::CaseIndependent{})) + if (entry.is_regular_file() && StringEqual(entry.path().extension().generic_u8string(), ".nzsl", Nz::CaseIndependent{})) { try {