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

Shader: Add initial support for arrays

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-01-01 23:01:31 +01:00
parent 89c7bbf197
commit 1f15328fdd
22 changed files with 781 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
#include <Nazara/Shader/SpirvConstantCache.hpp>
#include <Nazara/Shader/SpirvSection.hpp>
#include <Nazara/Shader/Ast/Nodes.hpp>
#include <Nazara/Utility/FieldOffsets.hpp>
#include <tsl/ordered_map.h>
#include <stdexcept>
@@ -35,6 +36,11 @@ namespace Nz
return lhs.value == rhs.value;
}
bool Compare(const Array& lhs, const Array& rhs) const
{
return lhs.length == rhs.length && Compare(lhs.elementType, rhs.elementType);
}
bool Compare(const Bool& /*lhs*/, const Bool& /*rhs*/) const
{
return true;
@@ -227,6 +233,12 @@ namespace Nz
{
}
void Register(const Array& array)
{
assert(array.elementType);
cache.Register(*array.elementType);
}
void Register(const Bool&) {}
void Register(const Float&) {}
void Register(const Integer&) {}
@@ -801,7 +813,9 @@ namespace Nz
{
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, Bool>)
if constexpr (std::is_same_v<T, Array>)
constants.Append(SpirvOp::OpTypeArray, resultId, GetId(*arg.elementType), arg.length);
else if constexpr (std::is_same_v<T, Bool>)
constants.Append(SpirvOp::OpTypeBool, resultId);
else if constexpr (std::is_same_v<T, Float>)
constants.Append(SpirvOp::OpTypeFloat, resultId, arg.width);
@@ -892,7 +906,12 @@ namespace Nz
{
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, Bool>)
if constexpr (std::is_same_v<T, Array>)
{
// TODO
throw std::runtime_error("todo");
}
else if constexpr (std::is_same_v<T, Bool>)
return structOffsets.AddField(StructFieldType::Bool1);
else if constexpr (std::is_same_v<T, Float>)
{