From acf323cd10b03e55422bb9e224c4a8422bf43e72 Mon Sep 17 00:00:00 2001 From: Tobias Frisch <tfrisch@uni-koblenz.de> Date: Sun, 19 Mar 2023 16:42:12 +0100 Subject: [PATCH] Adjust use of dictionary type in compiler Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de> --- modules/shader_compiler/include/vkcv/shader/Compiler.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/shader_compiler/include/vkcv/shader/Compiler.hpp b/modules/shader_compiler/include/vkcv/shader/Compiler.hpp index e30cdb34..873c7ba0 100644 --- a/modules/shader_compiler/include/vkcv/shader/Compiler.hpp +++ b/modules/shader_compiler/include/vkcv/shader/Compiler.hpp @@ -35,7 +35,7 @@ namespace vkcv::shader { /** * A map containing macros for shader compilation. */ - std::unordered_map<std::string, std::string> m_defines; + Dictionary<std::string, std::string> m_defines; public: /** @@ -70,7 +70,7 @@ namespace vkcv::shader { */ bool compileSourceWithHeaders(ShaderStage shaderStage, const std::string& shaderSource, - const std::unordered_map<std::filesystem::path, std::string>& shaderHeaders, + const Dictionary<std::filesystem::path, std::string>& shaderHeaders, const ShaderCompiledFunction& compiled); /** @@ -102,7 +102,7 @@ namespace vkcv::shader { * @param[in] update Flag to update shaders during runtime */ void compileProgram(ShaderProgram& program, - const std::unordered_map<ShaderStage, const std::filesystem::path>& stages, + const Dictionary<ShaderStage, const std::filesystem::path>& stages, const ShaderProgramCompiledFunction& compiled, const std::filesystem::path& includePath = "", bool update = false); -- GitLab