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

Fix redefinition of type

This commit is contained in:
Jérôme Leclercq 2020-08-27 20:12:54 +02:00
parent b2a7e620e0
commit c87affe276
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Shader/GlslWriter.inl
View File

@ -85,14 +85,14 @@ namespace Nz
std::visit([&](auto&& arg) std::visit([&](auto&& arg)
{ {
using T = std::decay_t<decltype(arg)>; using U = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, ShaderNodes::BasicType>) if constexpr (std::is_same_v<U, ShaderNodes::BasicType>)
{ {
Append(arg); Append(arg);
Append(" "); Append(" ");
Append(var.name); Append(var.name);
} }
else if constexpr (std::is_same_v<T, std::string>) else if constexpr (std::is_same_v<U, std::string>)
{ {
const auto& structs = shader.GetStructs(); const auto& structs = shader.GetStructs();
auto it = std::find_if(structs.begin(), structs.end(), [&](const auto& s) { return s.name == arg; }); auto it = std::find_if(structs.begin(), structs.end(), [&](const auto& s) { return s.name == arg; });
@ -115,7 +115,7 @@ namespace Nz
Append(var.name); Append(var.name);
} }
else else
static_assert(AlwaysFalse<T>::value, "non-exhaustive visitor"); static_assert(AlwaysFalse<U>::value, "non-exhaustive visitor");
}, var.type); }, var.type);