X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=a24d85dd5f0b7f025e01ab7b13dca85238b09535;hb=c39bb707ff8678d0675538994dc05182e61da193;hp=9388c04129cfc1b03020ef0f00da650bf2b46f1a;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 9388c041..a24d85dd 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -909,6 +909,27 @@ void ConstantConditionEliminator::visit(RefPtr<Expression> &expr)
 	r_ternary_result = 0;
 }
 
+void ConstantConditionEliminator::visit(UnaryExpression &unary)
+{
+	if(unary.oper->token[1]=='+' || unary.oper->token[1]=='-')
+		if(const VariableReference *var = dynamic_cast<const VariableReference *>(unary.expression.get()))
+		{
+			auto i = current_block->variables.find(var->name);
+			r_external_side_effects = (i==current_block->variables.end() || i->second!=var->declaration);
+			return;
+		}
+
+	TraversingVisitor::visit(unary);
+}
+
+void ConstantConditionEliminator::visit(Assignment &assign)
+{
+	auto i = find_if(current_block->variables, [&assign](const pair<string, VariableDeclaration *> &kvp){ return kvp.second==assign.target.declaration; });
+	if(i==current_block->variables.end())
+		r_external_side_effects = true;
+	TraversingVisitor::visit(assign);
+}
+
 void ConstantConditionEliminator::visit(TernaryExpression &ternary)
 {
 	ConstantStatus result = check_constant_condition(*ternary.condition);
@@ -918,6 +939,12 @@ void ConstantConditionEliminator::visit(TernaryExpression &ternary)
 		r_ternary_result = 0;
 }
 
+void ConstantConditionEliminator::visit(FunctionCall &call)
+{
+	r_external_side_effects = true;
+	TraversingVisitor::visit(call);
+}
+
 void ConstantConditionEliminator::visit(Conditional &cond)
 {
 	ConstantStatus result = check_constant_condition(*cond.condition);
@@ -930,7 +957,11 @@ void ConstantConditionEliminator::visit(Conditional &cond)
 		return;
 	}
 
+	r_external_side_effects = false;
 	TraversingVisitor::visit(cond);
+
+	if(cond.body.body.empty() && cond.else_body.body.empty() && !r_external_side_effects)
+		nodes_to_remove.insert(&cond);
 }
 
 void ConstantConditionEliminator::visit(Iteration &iter)
@@ -945,7 +976,10 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 		}
 	}
 
+	r_external_side_effects = false;
 	TraversingVisitor::visit(iter);
+	if(iter.body.body.empty() && !r_external_side_effects)
+		nodes_to_remove.insert(&iter);
 }