X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=96a75d603d6db5bdaaae35de41bbe16fb938cecf;hb=6997ed1c07c382c0f66c57c080934ad53e1d3713;hp=a7f29a16f8991c6342b6e3dcc1de6882da695a7b;hpb=c849969d056972dd976cfa616363f1bc8cbc6291;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index a7f29a16..96a75d60 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -356,7 +356,7 @@ void ExpressionInliner::visit(RefPtr<Expression> &expr)
 		ExpressionUse use;
 		use.reference = &expr;
 		use.ref_scope = current_block;
-		use.blocked = access_write;
+		use.blocked = access_write || r_ref_info->blocked;
 
 		if(iteration_body && !r_ref_info->trivial)
 		{
@@ -402,7 +402,7 @@ void ExpressionInliner::visit(Swizzle &swizzle)
 
 void ExpressionInliner::visit(UnaryExpression &unary)
 {
-	SetFlag set_write(access_write, access_write || unary.oper->token[1]=='+' || unary.oper->token[1]=='-');
+	SetFlag set_write(access_write, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));
 	visit(unary.expression);
 	r_trivial = false;
 }
@@ -428,10 +428,10 @@ void ExpressionInliner::visit(Assignment &assign)
 	r_trivial = true;
 	visit(assign.right);
 
-	auto i = assignments.find(assign.target);
+	auto i = assignments.find(assign.target.declaration);
 	if(i!=assignments.end())
 	{
-		if(iteration_body && i->second->expression)
+		if(iteration_body && i->second && i->second->expression)
 		{
 			/* Block inlining into previous references within the iteration
 			statement.  On iterations after the first they would refer to the
@@ -441,6 +441,10 @@ void ExpressionInliner::visit(Assignment &assign)
 					u.blocked = (k==iteration_body);
 		}
 
+		for(; (i!=assignments.end() && i->first.declaration==assign.target.declaration); ++i)
+			if(targets_overlap(i->first, assign.target))
+				i->second->blocked = true;
+
 		expressions.push_back(ExpressionInfo());
 		ExpressionInfo &info = expressions.back();
 		info.target = assign.target;
@@ -450,7 +454,7 @@ void ExpressionInliner::visit(Assignment &assign)
 		info.assign_scope = current_block;
 		info.trivial = r_trivial;
 
-		i->second = &info;
+		assignments[assign.target] = &info;
 	}
 
 	r_trivial = false;