X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=6e90698c97b500c5dd2edcaebd7e3f8c70e90026;hp=8805d41fadf01655f7328b60e501ce8c3a8b73d4;hb=3a1fe833ea04df75449706f1d773f6e65521a392;hpb=1476e64621ecbd7b17b00ae2c958322fd39918de

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 8805d41f..6e90698c 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -365,6 +365,20 @@ void ExpressionValidator::visit(Assignment &assign)
 	TraversingVisitor::visit(assign);
 }
 
+void ExpressionValidator::visit(TernaryExpression &ternary)
+{
+	if(ternary.condition->type)
+	{
+		BasicTypeDeclaration *basic_cond = dynamic_cast<BasicTypeDeclaration *>(ternary.condition->type);
+		if(!basic_cond || basic_cond->kind!=BasicTypeDeclaration::BOOL)
+			error(ternary, "Ternary operator condition is not a boolean");
+		else if(!ternary.type && ternary.true_expr->type && ternary.false_expr->type)
+			error(ternary, format("Ternary operator has incompatible types '%s' and '%s'",
+				ternary.true_expr->type->name, ternary.false_expr->type->name));
+	}
+	TraversingVisitor::visit(ternary);
+}
+
 void ExpressionValidator::visit(VariableDeclaration &var)
 {
 	if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)