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

Shader: Fix shader serialization

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-01 18:46:57 +02:00
parent ef737a8ecd
commit 7d2673eabd
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Shader/ShaderAstSerializer.hpp
View File

@@ -17,8 +17,6 @@
namespace Nz
{
static_assert(std::is_same_v<std::size_t, UInt32> || std::is_same_v<std::size_t, UInt64>);
class NAZARA_SHADER_API ShaderAstSerializerBase
{
public:
@@ -70,6 +68,7 @@ namespace Nz
virtual void Value(UInt16& val) = 0;
virtual void Value(UInt32& val) = 0;
virtual void Value(UInt64& val) = 0;
inline void SizeT(std::size_t& val);
virtual void Variable(ShaderNodes::VariablePtr& var) = 0;
template<typename T> void Variable(std::shared_ptr<T>& var);

21
include/Nazara/Shader/ShaderAstSerializer.inl
View File

@@ -69,7 +69,12 @@ namespace Nz
optVal.emplace();
if (optVal.has_value())
Value(optVal.value());
{
if constexpr (std::is_same_v<T, std::size_t>)
SizeT(optVal.value());
else
Value(optVal.value());
}
}
template<typename T>
@@ -86,6 +91,20 @@ namespace Nz
node = std::static_pointer_cast<T>(value);
}
inline void ShaderAstSerializerBase::SizeT(std::size_t& val)
{
bool isWriting = IsWriting();
UInt32 fixedVal;
if (isWriting)
fixedVal = static_cast<UInt32>(val);
Value(fixedVal);
if (!isWriting)
val = static_cast<std::size_t>(fixedVal);
}
template<typename T>
void ShaderAstSerializerBase::Variable(std::shared_ptr<T>& var)
{