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

Compilation fixes

This commit is contained in:
Jérôme Leclercq 2020-08-27 20:24:27 +02:00
parent c87affe276
commit 36120b9501
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ namespace Nz
SpirvPrinter(SpirvPrinter&&) = default; SpirvPrinter(SpirvPrinter&&) = default;
~SpirvPrinter() = default; ~SpirvPrinter() = default;
std::string Print(const UInt32* codepoints, std::size_t count, const Settings& 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;

10
src/Nazara/Shader/SpirvConstantCache.cpp
View File

@ -501,14 +501,16 @@ namespace Nz
if (!variable.debugName.empty()) if (!variable.debugName.empty())
debugInfos.Append(SpirvOp::OpName, resultId, variable.debugName); debugInfos.Append(SpirvOp::OpName, resultId, variable.debugName);
const auto& var = variable;
constants.AppendVariadic(SpirvOp::OpVariable, [&](const auto& appender) constants.AppendVariadic(SpirvOp::OpVariable, [&](const auto& appender)
{ {
appender(GetId(*variable.type)); appender(GetId(*var.type));
appender(resultId); appender(resultId);
appender(variable.storageClass); appender(var.storageClass);
if (variable.initializer) if (var.initializer)
appender(GetId((*variable.initializer)->constant)); appender(GetId((*var.initializer)->constant));
}); });
} }
} }

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

@ -22,7 +22,7 @@ namespace Nz
return std::visit(overloaded return std::visit(overloaded
{ {
[&](const Pointer& pointer) -> UInt32 [this](const Pointer& pointer) -> UInt32
{ {
UInt32 resultId = m_writer.AllocateResultId(); UInt32 resultId = m_writer.AllocateResultId();
@ -30,11 +30,11 @@ namespace Nz
return resultId; return resultId;
}, },
[&](const Value& value) -> UInt32 [](const Value& value) -> UInt32
{ {
return value.resultId; return value.resultId;
}, },
[this](std::monostate) -> UInt32 [](std::monostate) -> UInt32
{ {
throw std::runtime_error("an internal error occurred"); throw std::runtime_error("an internal error occurred");
} }