X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=b7ab9d3f7b9fc956c37752f18e7e5bb36df0e0d3;hp=610aa390964faa9ea91dc5fdc06695a0ea318d0c;hb=cb8ee1f5ea24a5f7b561fc88d4ff5af3ae364038;hpb=6d11ee7d6137117f441951615cd4cde4d59bf968

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 610aa390..b7ab9d3f 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -238,6 +238,15 @@ void VariableResolver::enter(Block &block)
 	block.variables.clear();
 }
 
+void VariableResolver::visit_and_replace(RefPtr<Expression> &expr)
+{
+	r_replacement_expr = 0;
+	expr->visit(*this);
+	if(r_replacement_expr)
+		expr = r_replacement_expr;
+	r_replacement_expr = 0;
+}
+
 void VariableResolver::visit(VariableReference &var)
 {
 	VariableDeclaration *declaration = 0;
@@ -260,11 +269,12 @@ void VariableResolver::visit(VariableReference &var)
 		{
 			/* The name refers to an interface block with an instance name rather
 			than a variable.  Prepare a new syntax tree node accordingly. */
-			r_iface_ref = new InterfaceBlockReference;
-			r_iface_ref->source = var.source;
-			r_iface_ref->line = var.line;
-			r_iface_ref->name = var.name;
-			r_iface_ref->declaration = i->second;
+			InterfaceBlockReference *iface_ref = new InterfaceBlockReference;
+			iface_ref->source = var.source;
+			iface_ref->line = var.line;
+			iface_ref->name = var.name;
+			iface_ref->declaration = i->second;
+			r_replacement_expr = iface_ref;
 		}
 		else
 		{
@@ -308,11 +318,7 @@ void VariableResolver::visit(InterfaceBlockReference &iface)
 
 void VariableResolver::visit(MemberAccess &memacc)
 {
-	r_iface_ref = 0;
-	memacc.left->visit(*this);
-	if(r_iface_ref)
-		memacc.left = r_iface_ref;
-	r_iface_ref = 0;
+	visit_and_replace(memacc.left);
 
 	map<string, VariableDeclaration *> *members = 0;
 	if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
@@ -337,8 +343,7 @@ void VariableResolver::visit(MemberAccess &memacc)
 
 void VariableResolver::visit(UnaryExpression &unary)
 {
-	TraversingVisitor::visit(unary);
-	r_iface_ref = 0;
+	visit_and_replace(unary.expression);
 }
 
 void VariableResolver::visit(BinaryExpression &binary)
@@ -349,17 +354,15 @@ void VariableResolver::visit(BinaryExpression &binary)
 			/* The subscript expression is not a part of the primary assignment
 			target. */
 			SetFlag set(record_target, false);
-			binary.right->visit(*this);
+			visit_and_replace(binary.right);
 		}
-		r_iface_ref = 0;
-		binary.left->visit(*this);
-		if(r_iface_ref)
-			binary.left = r_iface_ref;
+		visit_and_replace(binary.left);
 	}
 	else
-		TraversingVisitor::visit(binary);
-
-	r_iface_ref = 0;
+	{
+		visit_and_replace(binary.left);
+		visit_and_replace(binary.right);
+	}
 }
 
 void VariableResolver::visit(Assignment &assign)
@@ -367,22 +370,20 @@ void VariableResolver::visit(Assignment &assign)
 	{
 		SetFlag set(record_target);
 		r_assignment_target = 0;
-		assign.left->visit(*this);
+		visit_and_replace(assign.left);
 		r_any_resolved |= (r_assignment_target!=assign.target_declaration);
 		assign.target_declaration = r_assignment_target;
 	}
 
 	r_self_referencing = false;
-	assign.right->visit(*this);
+	visit_and_replace(assign.right);
 	assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
-
-	r_iface_ref = 0;
 }
 
 void VariableResolver::visit(FunctionCall &call)
 {
-	TraversingVisitor::visit(call);
-	r_iface_ref = 0;
+	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
+		visit_and_replace(*i);
 }
 
 void VariableResolver::visit(VariableDeclaration &var)