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

Shader: Better fix than 3ccec0ce

This commit is contained in:
Jérôme Leclercq 2022-03-09 08:08:23 +01:00
parent 3c290c1d0e
commit 1401c46d44
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Shader/Ast/SanitizeVisitor.cpp
View File

@ -887,11 +887,9 @@ namespace Nz::ShaderAst
} }
if (node.returnType.HasValue()) if (node.returnType.HasValue())
{
clone->returnType = ResolveType(node.returnType); clone->returnType = ResolveType(node.returnType);
if (clone->returnType.HasValue() && IsNoType(clone->returnType.GetResultingValue())) else
clone->returnType.Reset(); //< handle void as no return type clone->returnType = ExpressionType{ NoType{} };
}
if (node.depthWrite.HasValue()) if (node.depthWrite.HasValue())
clone->depthWrite = ComputeExprValue(node.depthWrite); clone->depthWrite = ComputeExprValue(node.depthWrite);

2
src/Nazara/Shader/GlslWriter.cpp
View File

@ -727,7 +727,7 @@ namespace Nz
AppendLine(); AppendLine();
} }
if (node.returnType.HasValue()) if (node.returnType.HasValue() && !IsNoType(node.returnType.GetResultingValue()))
{ {
assert(std::holds_alternative<ShaderAst::StructType>(node.returnType.GetResultingValue())); assert(std::holds_alternative<ShaderAst::StructType>(node.returnType.GetResultingValue()));
std::size_t outputStructIndex = std::get<ShaderAst::StructType>(node.returnType.GetResultingValue()).structIndex; std::size_t outputStructIndex = std::get<ShaderAst::StructType>(node.returnType.GetResultingValue()).structIndex;

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

@ -280,7 +280,7 @@ namespace Nz
std::optional<UInt32> outputStructId; std::optional<UInt32> outputStructId;
std::vector<EntryPoint::Output> outputs; std::vector<EntryPoint::Output> outputs;
if (node.returnType.HasValue()) if (node.returnType.HasValue() && !IsNoType(node.returnType.GetResultingValue()))
{ {
const ShaderAst::ExpressionType& returnType = node.returnType.GetResultingValue(); const ShaderAst::ExpressionType& returnType = node.returnType.GetResultingValue();