X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=2b18c84b653bbbc1195f30a69c362137ec5754db;hb=fe7996a5985e8e7064004d2f42758d89ebf54b57;hp=c5a507a222a96558a7582d72b8725216889d9fa7;hpb=dfcf8ebc329b79c369b88bdbeb982480aa5fc12a;p=libs%2Fgl.git

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index c5a507a2..2b18c84b 100644
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -281,13 +281,6 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
 	check_assignment_target(iface.declaration);
 }
 
-void VariableResolver::add_to_chain(Assignment::Target::ChainType type, unsigned index)
-{
-	if(r_assignment_target.chain_len<7)
-		r_assignment_target.chain[r_assignment_target.chain_len] = type | min<unsigned>(index, 0x3F);
-	++r_assignment_target.chain_len;
-}
-
 void VariableResolver::visit(MemberAccess &memacc)
 {
 	TraversingVisitor::visit(memacc);
@@ -300,11 +293,12 @@ void VariableResolver::visit(MemberAccess &memacc)
 		if(i!=strct->members.variables.end())
 		{
 			declaration = i->second;
+			index = 0;
 			for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); (j!=strct->members.body.end() && j->get()!=i->second); ++j)
 				++index;
 
 			if(record_target)
-				add_to_chain(Assignment::Target::MEMBER, index);
+				add_to_chain(r_assignment_target, Assignment::Target::MEMBER, index);
 		}
 	}
 	else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(memacc.left->type))
@@ -349,7 +343,7 @@ void VariableResolver::visit(Swizzle &swizzle)
 		unsigned mask = 0;
 		for(unsigned i=0; i<swizzle.count; ++i)
 			mask |= 1<<swizzle.components[i];
-		add_to_chain(Assignment::Target::SWIZZLE, mask);
+		add_to_chain(r_assignment_target, Assignment::Target::SWIZZLE, mask);
 	}
 }
 
@@ -371,7 +365,7 @@ void VariableResolver::visit(BinaryExpression &binary)
 			if(Literal *literal_subscript = dynamic_cast<Literal *>(binary.right.get()))
 				if(literal_subscript->value.check_type<int>())
 					index = literal_subscript->value.value<int>();
-			add_to_chain(Assignment::Target::ARRAY, index);
+			add_to_chain(r_assignment_target, Assignment::Target::ARRAY, index);
 		}
 	}
 	else
@@ -889,6 +883,8 @@ void ExpressionResolver::visit_constructor(FunctionCall &call)
 	map<string, TypeDeclaration *>::const_iterator i = stage->types.find(call.name);
 	if(i==stage->types.end())
 		return;
+	else if(call.arguments.size()==1 && i->second==call.arguments[0]->type)
+		;
 	else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(i->second))
 	{
 		BasicTypeDeclaration *elem = get_element_type(*basic);