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

Shader: AccessMember can now access nested fields

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-08-21 22:50:30 +02:00
parent 9df219e402
commit cd23c01ace
10 changed files with 80 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Nazara/Shader/SpirvWriter.cpp
View File

@@ -42,7 +42,8 @@ namespace Nz
void Visit(ShaderNodes::AccessMember& node) override
{
m_constantCache.Register(*SpirvConstantCache::BuildConstant(UInt32(node.memberIndex)));
for (std::size_t index : node.memberIndices)
m_constantCache.Register(*SpirvConstantCache::BuildConstant(Int32(index)));
ShaderAstRecursiveVisitor::Visit(node);
}
@@ -653,9 +654,16 @@ namespace Nz
UInt32 memberPointerId = AllocateResultId();
UInt32 pointerType = RegisterPointerType(node.exprType, storage); //< FIXME
UInt32 typeId = GetTypeId(node.exprType);
UInt32 indexId = GetConstantId(UInt32(node.memberIndex));
m_currentState->instructions.Append(SpirvOp::OpAccessChain, pointerType, memberPointerId, pointerId, indexId);
m_currentState->instructions.AppendVariadic(SpirvOp::OpAccessChain, [&](const auto& appender)
{
appender(pointerType);
appender(memberPointerId);
appender(pointerId);
for (std::size_t index : node.memberIndices)
appender(GetConstantId(Int32(index)));
});
UInt32 resultId = AllocateResultId();
@@ -1047,8 +1055,6 @@ namespace Nz
void SpirvWriter::Visit(ShaderNodes::Sample2D& node)
{
// OpImageSampleImplicitLod %v4float %31 %35
UInt32 typeId = GetTypeId(ShaderNodes::BasicType::Float4);
UInt32 samplerId = EvaluateExpression(node.sampler);