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

Remove Value for size_t and correctly fix the problem

This commit is contained in:
ImperatorS79 2020-11-21 20:21:26 +01:00
parent 4bf49876c6
commit 143d7d391a
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,6 @@ namespace Nz
virtual void Value(UInt16& val) = 0; virtual void Value(UInt16& val) = 0;
virtual void Value(UInt32& val) = 0; virtual void Value(UInt32& val) = 0;
virtual void Value(UInt64& val) = 0; virtual void Value(UInt64& val) = 0;
virtual void Value(std::size_t& val) = 0;
inline void SizeT(std::size_t& val); inline void SizeT(std::size_t& val);
virtual void Variable(ShaderNodes::VariablePtr& var) = 0; virtual void Variable(ShaderNodes::VariablePtr& var) = 0;
@ -102,7 +101,6 @@ namespace Nz
void Value(UInt16& val) override; void Value(UInt16& val) override;
void Value(UInt32& val) override; void Value(UInt32& val) override;
void Value(UInt64& val) override; void Value(UInt64& val) override;
void Value(std::size_t& val) override;
void Variable(ShaderNodes::VariablePtr& var) override; void Variable(ShaderNodes::VariablePtr& var) override;
ByteStream& m_stream; ByteStream& m_stream;
@ -134,7 +132,6 @@ namespace Nz
void Value(UInt16& val) override; void Value(UInt16& val) override;
void Value(UInt32& val) override; void Value(UInt32& val) override;
void Value(UInt64& val) override; void Value(UInt64& val) override;
void Value(std::size_t& val) override;
void Variable(ShaderNodes::VariablePtr& var) override; void Variable(ShaderNodes::VariablePtr& var) override;
ByteStream& m_stream; ByteStream& m_stream;

12
src/Nazara/Shader/ShaderAstSerializer.cpp
View File

@ -258,7 +258,7 @@ namespace Nz
void ShaderAstSerializerBase::Serialize(ShaderNodes::SwizzleOp& node) void ShaderAstSerializerBase::Serialize(ShaderNodes::SwizzleOp& node)
{ {
Value(node.componentCount); SizeT(node.componentCount);
Node(node.expression); Node(node.expression);
for (std::size_t i = 0; i < node.componentCount; ++i) for (std::size_t i = 0; i < node.componentCount; ++i)
@ -466,11 +466,6 @@ namespace Nz
m_stream << val; m_stream << val;
} }
void ShaderAstSerializer::Value(std::size_t& val)
{
m_stream << val;
}
void ShaderAstSerializer::Variable(ShaderNodes::VariablePtr& var) void ShaderAstSerializer::Variable(ShaderNodes::VariablePtr& var)
{ {
ShaderNodes::VariableType nodeType = (var) ? var->GetType() : ShaderNodes::VariableType::None; ShaderNodes::VariableType nodeType = (var) ? var->GetType() : ShaderNodes::VariableType::None;
@ -737,11 +732,6 @@ namespace Nz
m_stream >> val; m_stream >> val;
} }
void ShaderAstUnserializer::Value(std::size_t& val)
{
m_stream >> val;
}
void ShaderAstUnserializer::Variable(ShaderNodes::VariablePtr& var) void ShaderAstUnserializer::Variable(ShaderNodes::VariablePtr& var)
{ {
Int32 nodeTypeInt; Int32 nodeTypeInt;