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

Some more fixes, hopefully GCC will stop shitting itself now

This commit is contained in:
Jérôme Leclercq 2020-08-27 23:22:13 +02:00
parent 3fe70476bb
commit 0ff0425045
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Angle.inl
View File

@ -126,7 +126,7 @@ namespace Nz
template<typename T> template<typename T>
void SinCos(std::enable_if_t<std::is_same<T, long double>::value, long double> x, long double* s, long double* c) void SinCos(std::enable_if_t<std::is_same<T, long double>::value, long double> x, long double* s, long double* c)
{ {
::sincosl(x, sin, cos); ::sincosl(x, s, c);
} }
#else #else
// Naive implementation, hopefully optimized by the compiler // Naive implementation, hopefully optimized by the compiler

4
include/Nazara/Shader/SpirvPrinter.hpp
View File

@ -23,8 +23,8 @@ namespace Nz
SpirvPrinter(SpirvPrinter&&) = default; SpirvPrinter(SpirvPrinter&&) = default;
~SpirvPrinter() = default; ~SpirvPrinter() = default;
std::string Print(const UInt32* codepoints, std::size_t count); inline std::string Print(const UInt32* codepoints, std::size_t count);
std::string Print(const UInt32* codepoints, std::size_t count, const Settings& settings = {}); std::string Print(const UInt32* codepoints, std::size_t count, const Settings& settings);
SpirvPrinter& operator=(const SpirvPrinter&) = default; SpirvPrinter& operator=(const SpirvPrinter&) = default;
SpirvPrinter& operator=(SpirvPrinter&&) = default; SpirvPrinter& operator=(SpirvPrinter&&) = default;

6
src/Nazara/Shader/SpirvExpressionStore.cpp
View File

@ -29,7 +29,7 @@ namespace Nz
{ {
m_writer.WriteLocalVariable(value.varName, resultId); m_writer.WriteLocalVariable(value.varName, resultId);
}, },
[this](std::monostate) [](std::monostate)
{ {
throw std::runtime_error("an internal error occurred"); throw std::runtime_error("an internal error occurred");
} }
@ -62,11 +62,11 @@ namespace Nz
return resultId; return resultId;
}, },
[&](const LocalVar& value) -> UInt32 [](const LocalVar& value) -> UInt32
{ {
throw std::runtime_error("not yet implemented"); throw std::runtime_error("not yet implemented");
}, },
[this](std::monostate) -> UInt32 [](std::monostate) -> UInt32
{ {
throw std::runtime_error("an internal error occurred"); throw std::runtime_error("an internal error occurred");
} }