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

Shader/SPIRV: Handle arrays properly

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-01-23 19:59:26 +01:00
parent 2463e471cc
commit b8a52b93e8
2 changed files with 243 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/Nazara/Shader/SpirvConstantCache.hpp
View File

@@ -20,6 +20,7 @@
namespace Nz
{
class FieldOffsets;
class SpirvSection;
class NAZARA_SHADER_API SpirvConstantCache
@@ -108,6 +109,7 @@ namespace Nz
{
std::string name;
TypePtr type;
mutable std::optional<UInt32> offset;
};
std::string name;
@@ -171,6 +173,7 @@ namespace Nz
};
ConstantPtr BuildConstant(const ShaderAst::ConstantValue& value) const;
FieldOffsets BuildFieldOffsets(const Structure& structData) const;
TypePtr BuildFunctionType(const ShaderAst::ExpressionType& retType, const std::vector<ShaderAst::ExpressionType>& parameters) const;
TypePtr BuildPointerType(const ShaderAst::PrimitiveType& type, SpirvStorageClass storageClass) const;
TypePtr BuildPointerType(const ShaderAst::ExpressionType& type, SpirvStorageClass storageClass) const;
@@ -195,6 +198,20 @@ namespace Nz
UInt32 Register(Type t);
UInt32 Register(Variable v);
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Array& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Bool& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Float& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Function& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Image& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Integer& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Matrix& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Pointer& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const SampledImage& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Structure& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Type& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Vector& type, std::size_t arrayLength) const;
std::size_t RegisterArrayField(FieldOffsets& fieldOffsets, const Void& type, std::size_t arrayLength) const;
void SetStructCallback(StructCallback callback);
void Write(SpirvSection& annotations, SpirvSection& constants, SpirvSection& debugInfos);