X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=1e57ed649041cacdfaa58b56fa0a56dee5642dc9;hb=4414f0245005c8cfcd02b51ea394d612cc5776c4;hp=f29d65f58bfeeaf4fe837fa2222226473c6d3c66;hpb=f639d088c478fe5d266f9f5779928735b5176976;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index f29d65f5..1e57ed64 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -657,11 +657,17 @@ void ExpressionResolver::visit(BinaryExpression &binary, bool assign)
 	}
 	else if((oper=='<' || oper=='>') && oper2==oper)
 	{
-		// Shifts only apply to integers.
-		if(basic_left->kind!=BasicTypeDeclaration::INT || basic_right->kind!=BasicTypeDeclaration::INT)
+		// Shifts apply to integer scalars and vectors, with some restrictions.
+		if(elem_left->kind!=BasicTypeDeclaration::INT || elem_right->kind!=BasicTypeDeclaration::INT)
+			return;
+		unsigned left_size = (basic_left->kind==BasicTypeDeclaration::INT ? 1 : basic_left->kind==BasicTypeDeclaration::VECTOR ? basic_left->size : 0);
+		unsigned right_size = (basic_right->kind==BasicTypeDeclaration::INT ? 1 : basic_right->kind==BasicTypeDeclaration::VECTOR ? basic_right->size : 0);
+		if(!left_size || (left_size==1 && right_size!=1) || (left_size>1 && right_size!=1 && right_size!=left_size))
 			return;
 
 		type = basic_left;
+		// Don't perform conversion even if the operands are of different sizes.
+		compat = SAME_TYPE;
 	}
 	else if(oper=='+' || oper=='-' || oper=='*' || oper=='/')
 	{