X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=113b4324aa2b64432b41cf7be63ff13ca30ed8c4;hb=7f2ffe6e62bc7d7b2af7d3c3cccc57f87d8bf90f;hp=3e53c1526daa88c43766dbfc4a019d267c317157;hpb=f526938b407e061c7424adedc34af4d1ff687f90;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 3e53c152..113b4324 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -257,8 +257,7 @@ VariableResolver::VariableResolver():
 	stage(0),
 	r_any_resolved(false),
 	record_target(false),
-	r_self_referencing(false),
-	r_assignment_target(0)
+	r_self_referencing(false)
 { }
 
 bool VariableResolver::apply(Stage &s)
@@ -275,18 +274,40 @@ void VariableResolver::enter(Block &block)
 	block.variables.clear();
 }
 
-void VariableResolver::visit_and_replace(RefPtr<Expression> &expr)
+void VariableResolver::visit(RefPtr<Expression> &expr)
 {
 	r_replacement_expr = 0;
 	expr->visit(*this);
 	if(r_replacement_expr)
 	{
 		expr = r_replacement_expr;
+		/* Don't record assignment target when doing a replacement, because chain
+		information won't be correct. */
+		r_assignment_target.declaration = 0;
 		r_any_resolved = true;
 	}
 	r_replacement_expr = 0;
 }
 
+void VariableResolver::check_assignment_target(Statement *declaration)
+{
+	if(record_target)
+	{
+		if(r_assignment_target.declaration)
+		{
+			/* More than one reference found in assignment target.  Unable to
+			determine what the primary target is. */
+			record_target = false;
+			r_assignment_target.declaration = 0;
+		}
+		else
+			r_assignment_target.declaration = declaration;
+	}
+	// TODO This check is overly broad and may prevent some optimizations.
+	else if(declaration && declaration==r_assignment_target.declaration)
+		r_self_referencing = true;
+}
+
 void VariableResolver::visit(VariableReference &var)
 {
 	VariableDeclaration *declaration = 0;
@@ -333,20 +354,7 @@ void VariableResolver::visit(VariableReference &var)
 	r_any_resolved |= (declaration!=var.declaration);
 	var.declaration = declaration;
 
-	if(record_target)
-	{
-		if(r_assignment_target)
-		{
-			/* More than one variable reference found in assignment target.
-			Unable to determine what the primary target is. */
-			record_target = false;
-			r_assignment_target = 0;
-		}
-		else
-			r_assignment_target = var.declaration;
-	}
-	else if(var.declaration && var.declaration==r_assignment_target)
-		r_self_referencing = true;
+	check_assignment_target(var.declaration);
 }
 
 void VariableResolver::visit(InterfaceBlockReference &iface)
@@ -355,18 +363,38 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
 	InterfaceBlock *declaration = (i!=stage->interface_blocks.end() ? i->second : 0);
 	r_any_resolved |= (declaration!=iface.declaration);
 	iface.declaration = declaration;
+
+	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)
 {
-	visit_and_replace(memacc.left);
+	TraversingVisitor::visit(memacc);
 
 	VariableDeclaration *declaration = 0;
 	if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
 	{
 		map<string, VariableDeclaration *>::iterator i = strct->members.variables.find(memacc.member);
 		if(i!=strct->members.variables.end())
+		{
 			declaration = i->second;
+
+			if(record_target)
+			{
+				unsigned index = 0;
+				for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); (j!=strct->members.body.end() && j->get()!=i->second); ++j)
+					++index;
+
+				add_to_chain(Assignment::Target::MEMBER, index);
+			}
+		}
 	}
 	else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(memacc.left->type))
 	{
@@ -402,12 +430,15 @@ void VariableResolver::visit(MemberAccess &memacc)
 
 void VariableResolver::visit(Swizzle &swizzle)
 {
-	visit_and_replace(swizzle.left);
-}
+	TraversingVisitor::visit(swizzle);
 
-void VariableResolver::visit(UnaryExpression &unary)
-{
-	visit_and_replace(unary.expression);
+	if(record_target)
+	{
+		unsigned mask = 0;
+		for(unsigned i=0; i<swizzle.count; ++i)
+			mask |= 1<<swizzle.components[i];
+		add_to_chain(Assignment::Target::SWIZZLE, mask);
+	}
 }
 
 void VariableResolver::visit(BinaryExpression &binary)
@@ -418,46 +449,41 @@ void VariableResolver::visit(BinaryExpression &binary)
 			/* The subscript expression is not a part of the primary assignment
 			target. */
 			SetFlag set(record_target, false);
-			visit_and_replace(binary.right);
+			visit(binary.right);
+		}
+		visit(binary.left);
+
+		if(record_target)
+		{
+			unsigned index = 0x3F;
+			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);
 		}
-		visit_and_replace(binary.left);
 	}
 	else
-	{
-		visit_and_replace(binary.left);
-		visit_and_replace(binary.right);
-	}
+		TraversingVisitor::visit(binary);
 }
 
 void VariableResolver::visit(Assignment &assign)
 {
 	{
 		SetFlag set(record_target);
-		r_assignment_target = 0;
-		visit_and_replace(assign.left);
-		r_any_resolved |= (r_assignment_target!=assign.target_declaration);
-		assign.target_declaration = r_assignment_target;
+		r_assignment_target = Assignment::Target();
+		visit(assign.left);
+		r_any_resolved |= (r_assignment_target<assign.target || assign.target<r_assignment_target);
+		assign.target = r_assignment_target;
 	}
 
 	r_self_referencing = false;
-	visit_and_replace(assign.right);
+	visit(assign.right);
 	assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
 }
 
-void VariableResolver::visit(FunctionCall &call)
-{
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		visit_and_replace(*i);
-}
-
 void VariableResolver::visit(VariableDeclaration &var)
 {
-	if(var.layout)
-		var.layout->visit(*this);
-	if(var.array_size)
-		visit_and_replace(var.array_size);
-	if(var.init_expression)
-		visit_and_replace(var.init_expression);
+	TraversingVisitor::visit(var);
 	current_block->variables.insert(make_pair(var.name, &var));
 }
 
@@ -891,8 +917,9 @@ bool FunctionResolver::apply(Stage &s)
 void FunctionResolver::visit(FunctionCall &call)
 {
 	map<string, FunctionDeclaration *>::iterator i = stage->functions.find(call.name);
-	if(i!=stage->functions.end())
-		call.declaration = i->second;
+	FunctionDeclaration *declaration = (i!=stage->functions.end() ? i->second : 0);
+	r_any_resolved |= (declaration!=call.declaration);
+	call.declaration = declaration;
 
 	TraversingVisitor::visit(call);
 }
@@ -908,17 +935,19 @@ void FunctionResolver::visit(FunctionDeclaration &func)
 		// Set all previous declarations to use this definition.
 		for(vector<FunctionDeclaration *>::iterator i=decls.begin(); i!=decls.end(); ++i)
 		{
+			r_any_resolved |= (func.definition!=(*i)->definition);
 			(*i)->definition = func.definition;
 			(*i)->body.body.clear();
 		}
 	}
 	else
 	{
-		func.definition = 0;
+		FunctionDeclaration *definition = (stage_decl ? stage_decl->definition : 0);
+		r_any_resolved |= (definition!=func.definition);
+		func.definition = definition;
+
 		if(!stage_decl)
 			stage_decl = &func;
-		else
-			func.definition = stage_decl->definition;
 	}
 	decls.push_back(&func);