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

Renderer/ShaderAst: Fix Mat4x4 handling

This commit is contained in:
Lynix 2017-01-06 01:06:49 +01:00
parent 10a1bec793
commit 021ac3d971
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
include/Nazara/Renderer/ShaderAst.inl
View File

@ -21,9 +21,11 @@ namespace Nz
return 3; return 3;
case ExpressionType::Float4: case ExpressionType::Float4:
case ExpressionType::Mat4x4:
return 4; return 4;
case ExpressionType::Mat4x4:
return 16;
default: default:
return 1; return 1;
} }
@ -85,9 +87,49 @@ namespace Nz
left(std::move(Left)), left(std::move(Left)),
right(std::move(Right)) right(std::move(Right))
{ {
//TODO: AstParseError ExpressionType leftType = left->GetExpressionType();
if (left->GetExpressionType() != right->GetExpressionType()) ExpressionType rightType = right->GetExpressionType();
throw std::runtime_error("Left expression type must match right expression type");
if (leftType != rightType)
{
switch (op)
{
case BinaryType::Add:
case BinaryType::Divide:
case BinaryType::Equality:
case BinaryType::Substract:
{
//TODO: AstParseError
throw std::runtime_error("Left expression type must match right expression type");
}
case BinaryType::Multiply:
{
switch (leftType)
{
case ExpressionType::Mat4x4:
{
switch (rightType)
{
case ExpressionType::Float4:
case ExpressionType::Mat4x4:
break;
//TODO: AstParseError
default:
throw std::runtime_error("Left expression type is not compatible with right expression type");
}
break;
}
default:
//TODO: AstParseError
throw std::runtime_error("Left expression type must match right expression type");
}
}
}
}
} }
inline Branch::Branch(ExpressionPtr condition, StatementPtr trueStatement, StatementPtr falseStatement) inline Branch::Branch(ExpressionPtr condition, StatementPtr trueStatement, StatementPtr falseStatement)