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

Shader: Add support for logical and/or

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-07 15:23:39 +02:00
parent ea899e4361
commit 72edff30c7
9 changed files with 192 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Nazara/Shader/Ast/AstOptimizer.cpp
View File

@@ -152,6 +152,44 @@ namespace Nz::ShaderAst
using Op = BinaryCompNe<T1, T2>;
};
// LogicalAnd
template<typename T1, typename T2>
struct BinaryLogicalAndBase
{
std::unique_ptr<ConstantExpression> operator()(const T1& lhs, const T2& rhs)
{
return ShaderBuilder::Constant(lhs && rhs);
}
};
template<typename T1, typename T2>
struct BinaryLogicalAnd;
template<typename T1, typename T2>
struct BinaryConstantPropagation<BinaryType::LogicalAnd, T1, T2>
{
using Op = BinaryLogicalAnd<T1, T2>;
};
// LogicalOr
template<typename T1, typename T2>
struct BinaryLogicalOrBase
{
std::unique_ptr<ConstantExpression> operator()(const T1& lhs, const T2& rhs)
{
return ShaderBuilder::Constant(lhs || rhs);
}
};
template<typename T1, typename T2>
struct BinaryLogicalOr;
template<typename T1, typename T2>
struct BinaryConstantPropagation<BinaryType::LogicalOr, T1, T2>
{
using Op = BinaryLogicalOr<T1, T2>;
};
// Addition
template<typename T1, typename T2>
struct BinaryAdditionBase
@@ -325,7 +363,6 @@ namespace Nz::ShaderAst
EnableOptimisation(BinaryCompEq, Vector3i32, Vector3i32);
EnableOptimisation(BinaryCompEq, Vector4i32, Vector4i32);
EnableOptimisation(BinaryCompGe, bool, bool);
EnableOptimisation(BinaryCompGe, double, double);
EnableOptimisation(BinaryCompGe, float, float);
EnableOptimisation(BinaryCompGe, Int32, Int32);
@@ -336,7 +373,6 @@ namespace Nz::ShaderAst
EnableOptimisation(BinaryCompGe, Vector3i32, Vector3i32);
EnableOptimisation(BinaryCompGe, Vector4i32, Vector4i32);
EnableOptimisation(BinaryCompGt, bool, bool);
EnableOptimisation(BinaryCompGt, double, double);
EnableOptimisation(BinaryCompGt, float, float);
EnableOptimisation(BinaryCompGt, Int32, Int32);
@@ -347,7 +383,6 @@ namespace Nz::ShaderAst
EnableOptimisation(BinaryCompGt, Vector3i32, Vector3i32);
EnableOptimisation(BinaryCompGt, Vector4i32, Vector4i32);
EnableOptimisation(BinaryCompLe, bool, bool);
EnableOptimisation(BinaryCompLe, double, double);
EnableOptimisation(BinaryCompLe, float, float);
EnableOptimisation(BinaryCompLe, Int32, Int32);
@@ -358,7 +393,6 @@ namespace Nz::ShaderAst
EnableOptimisation(BinaryCompLe, Vector3i32, Vector3i32);
EnableOptimisation(BinaryCompLe, Vector4i32, Vector4i32);
EnableOptimisation(BinaryCompLt, bool, bool);
EnableOptimisation(BinaryCompLt, double, double);
EnableOptimisation(BinaryCompLt, float, float);
EnableOptimisation(BinaryCompLt, Int32, Int32);
@@ -380,6 +414,9 @@ namespace Nz::ShaderAst
EnableOptimisation(BinaryCompNe, Vector3i32, Vector3i32);
EnableOptimisation(BinaryCompNe, Vector4i32, Vector4i32);
EnableOptimisation(BinaryLogicalAnd, bool, bool);
EnableOptimisation(BinaryLogicalOr, bool, bool);
EnableOptimisation(BinaryAddition, double, double);
EnableOptimisation(BinaryAddition, float, float);
EnableOptimisation(BinaryAddition, Int32, Int32);
@@ -583,6 +620,14 @@ namespace Nz::ShaderAst
case BinaryType::CompNe:
optimized = PropagateBinaryConstant<BinaryType::CompNe>(std::move(lhsConstant), std::move(rhsConstant));
break;
case BinaryType::LogicalAnd:
optimized = PropagateBinaryConstant<BinaryType::LogicalAnd>(std::move(lhsConstant), std::move(rhsConstant));
break;
case BinaryType::LogicalOr:
optimized = PropagateBinaryConstant<BinaryType::LogicalOr>(std::move(lhsConstant), std::move(rhsConstant));
break;
}
if (optimized)

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

@@ -314,7 +314,18 @@ namespace Nz::ShaderAst
default:
throw AstError{ "incompatible types" };
}
break;
}
case BinaryType::LogicalAnd:
case BinaryType::LogicalOr:
if (leftType != PrimitiveType::Boolean)
throw AstError{ "logical and/or are only supported on booleans" };
TypeMustMatch(clone->left, clone->right);
clone->cachedExpressionType = PrimitiveType::Boolean;
break;
}
}
else if (IsMatrixType(leftExprType))
@@ -363,7 +374,13 @@ namespace Nz::ShaderAst
}
else
throw AstError{ "incompatible types" };
break;
}
case BinaryType::LogicalAnd:
case BinaryType::LogicalOr:
throw AstError{ "logical and/or are only supported on booleans" };
}
}
else if (IsVectorType(leftExprType))
@@ -402,7 +419,13 @@ namespace Nz::ShaderAst
}
else
throw AstError{ "incompatible types" };
break;
}
case BinaryType::LogicalAnd:
case BinaryType::LogicalOr:
throw AstError{ "logical and/or are only supported on booleans" };
}
}