X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=87a57eb7f82496c797c6afdcf7ddbb257049655c;hb=05d8360ceef28e0b36e96127e04a82dd77a5c433;hp=87410d5a78c46d3e8eb2e38c9d3a2fd24ffafcef;hpb=daff631cf87db75bcae616605e759d281258d9e4;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 87410d5a..87a57eb7 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -193,7 +193,7 @@ bool FunctionInliner::apply(Stage &s)
 	return r_any_inlined;
 }
 
-void FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
+void FunctionInliner::visit(RefPtr<Expression> &ptr)
 {
 	r_inline_result = 0;
 	ptr->visit(*this);
@@ -216,31 +216,10 @@ void FunctionInliner::visit(Block &block)
 	}
 }
 
-void FunctionInliner::visit(UnaryExpression &unary)
-{
-	visit_and_inline(unary.expression);
-}
-
-void FunctionInliner::visit(BinaryExpression &binary)
-{
-	visit_and_inline(binary.left);
-	visit_and_inline(binary.right);
-}
-
-void FunctionInliner::visit(MemberAccess &memacc)
-{
-	visit_and_inline(memacc.left);
-}
-
-void FunctionInliner::visit(Swizzle &swizzle)
-{
-	visit_and_inline(swizzle.left);
-}
-
 void FunctionInliner::visit(FunctionCall &call)
 {
 	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		visit_and_inline(*i);
+		visit(*i);
 
 	FunctionDeclaration *def = call.declaration;
 	if(def)
@@ -264,29 +243,12 @@ void FunctionInliner::visit(FunctionCall &call)
 	}
 }
 
-void FunctionInliner::visit(ExpressionStatement &expr)
-{
-	visit_and_inline(expr.expression);
-}
-
-void FunctionInliner::visit(VariableDeclaration &var)
-{
-	if(var.init_expression)
-		visit_and_inline(var.init_expression);
-}
-
 void FunctionInliner::visit(FunctionDeclaration &func)
 {
 	SetForScope<FunctionDeclaration *> set_func(current_function, &func);
 	TraversingVisitor::visit(func);
 }
 
-void FunctionInliner::visit(Conditional &cond)
-{
-	visit_and_inline(cond.condition);
-	cond.body.visit(*this);
-}
-
 void FunctionInliner::visit(Iteration &iter)
 {
 	/* Visit the initialization statement before entering the loop body so the
@@ -301,12 +263,6 @@ void FunctionInliner::visit(Iteration &iter)
 	iter.body.visit(*this);
 }
 
-void FunctionInliner::visit(Return &ret)
-{
-	if(ret.expression)
-		visit_and_inline(ret.expression);
-}
-
 
 ExpressionInliner::ExpressionInfo::ExpressionInfo():
 	expression(0),
@@ -413,6 +369,11 @@ void ExpressionInliner::visit(Block &block)
 			i->second.available = false;
 }
 
+void ExpressionInliner::visit(RefPtr<Expression> &expr)
+{
+	visit_and_record(expr, 0, false);
+}
+
 void ExpressionInliner::visit(VariableReference &var)
 {
 	if(var.declaration)
@@ -493,8 +454,7 @@ void ExpressionInliner::visit(Assignment &assign)
 
 void ExpressionInliner::visit(FunctionCall &call)
 {
-	for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
-		visit_and_record(*i, 0, false);
+	TraversingVisitor::visit(call);
 	r_oper = 0;
 	r_trivial = false;
 }
@@ -503,8 +463,7 @@ void ExpressionInliner::visit(VariableDeclaration &var)
 {
 	r_oper = 0;
 	r_trivial = true;
-	if(var.init_expression)
-		visit_and_record(var.init_expression, 0, false);
+	TraversingVisitor::visit(var);
 
 	bool constant = var.constant;
 	if(constant && var.layout)
@@ -528,12 +487,6 @@ void ExpressionInliner::visit(VariableDeclaration &var)
 	}
 }
 
-void ExpressionInliner::visit(Conditional &cond)
-{
-	visit_and_record(cond.condition, 0, false);
-	cond.body.visit(*this);
-}
-
 void ExpressionInliner::visit(Iteration &iter)
 {
 	SetForScope<Block *> set_block(current_block, &iter.body);
@@ -545,16 +498,10 @@ void ExpressionInliner::visit(Iteration &iter)
 
 	SetForScope<Block *> set_body(iteration_body, &iter.body);
 	if(iter.condition)
-		iter.condition->visit(*this);
+		visit(iter.condition);
 	iter.body.visit(*this);
 	if(iter.loop_expression)
-		iter.loop_expression->visit(*this);
-}
-
-void ExpressionInliner::visit(Return &ret)
-{
-	if(ret.expression)
-		visit_and_record(ret.expression, 0, false);
+		visit(iter.loop_expression);
 }
 
 
@@ -576,15 +523,14 @@ void ConstantConditionEliminator::visit(Block &block)
 
 void ConstantConditionEliminator::visit(Conditional &cond)
 {
-	ExpressionEvaluator eval;
-	cond.condition->visit(eval);
-	if(eval.is_result_valid())
-	{
-		Block &block = (eval.get_result() ? cond.body : cond.else_body);
-		current_block->body.splice(insert_point, block.body);
-		nodes_to_remove.insert(&cond);
-		return;
-	}
+	if(Literal *literal = dynamic_cast<Literal *>(cond.condition.get()))
+		if(literal->value.check_type<bool>())
+		{
+			Block &block = (literal->value.value<bool>() ? cond.body : cond.else_body);
+			current_block->body.splice(insert_point, block.body);
+			nodes_to_remove.insert(&cond);
+			return;
+		}
 
 	TraversingVisitor::visit(cond);
 }
@@ -611,15 +557,6 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 }
 
 
-UnusedVariableRemover::VariableInfo::VariableInfo():
-	local(false),
-	output(false),
-	conditionally_assigned(false),
-	referenced(false),
-	interface_block(0)
-{ }
-
-
 bool UnusedTypeRemover::apply(Stage &stage)
 {
 	stage.content.visit(*this);
@@ -687,6 +624,15 @@ void UnusedTypeRemover::visit(FunctionDeclaration &func)
 }
 
 
+UnusedVariableRemover::VariableInfo::VariableInfo():
+	local(false),
+	output(false),
+	conditionally_assigned(false),
+	referenced(false),
+	interface_block(0)
+{ }
+
+
 UnusedVariableRemover::UnusedVariableRemover():
 	stage(0),
 	interface_block(0),
@@ -714,7 +660,7 @@ bool UnusedVariableRemover::apply(Stage &s)
 		}
 		if(output)
 		{
-			if(!i->second.assignments.empty() && i->second.interface_block)
+			if((i->second.referenced || !i->second.assignments.empty()) && i->second.interface_block)
 				used_interface_blocks.insert(i->second.interface_block);
 			continue;
 		}