X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=f333ef44b0cfe5ef1a88b26a17203faf1b09ac82;hb=1ce5df9e70385c8758eec39589a148e63238b0a8;hp=927047cc7c1e387890bf4a3d1a4a784e2039c7ac;hpb=3415ed0f925d781df9d8243e0f4c454516b1c450;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 927047cc..f333ef44 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -75,7 +75,7 @@ void InlineableFunctionLocator::visit(FunctionCall &call)
 		++count;
 		/* Don't inline functions which are called more than once or are called
 		recursively. */
-		if(count>1 || def==current_function)
+		if((count>1 && def->source!=BUILTIN_SOURCE) || def==current_function)
 			inlineable.erase(def);
 	}
 
@@ -89,7 +89,7 @@ void InlineableFunctionLocator::visit(FunctionDeclaration &func)
 		has_out_params = ((*i)->interface=="out");
 
 	unsigned &count = refcounts[func.definition];
-	if(count<=1 && !has_out_params)
+	if((count<=1 || func.source==BUILTIN_SOURCE) && !has_out_params)
 		inlineable.insert(func.definition);
 
 	SetForScope<FunctionDeclaration *> set(current_function, &func);
@@ -907,6 +907,52 @@ void ConstantConditionEliminator::visit(Iteration &iter)
 }
 
 
+UnreachableCodeRemover::UnreachableCodeRemover():
+	reachable(true)
+{ }
+
+bool UnreachableCodeRemover::apply(Stage &stage)
+{
+	stage.content.visit(*this);
+	NodeRemover().apply(stage, unreachable_nodes);
+	return !unreachable_nodes.empty();
+}
+
+void UnreachableCodeRemover::visit(Block &block)
+{
+	NodeList<Statement>::iterator i = block.body.begin();
+	for(; (reachable && i!=block.body.end()); ++i)
+		(*i)->visit(*this);
+	for(; i!=block.body.end(); ++i)
+		unreachable_nodes.insert(i->get());
+}
+
+void UnreachableCodeRemover::visit(FunctionDeclaration &func)
+{
+	TraversingVisitor::visit(func);
+	reachable = true;
+}
+
+void UnreachableCodeRemover::visit(Conditional &cond)
+{
+	cond.body.visit(*this);
+	bool reachable_if_true = reachable;
+	reachable = true;
+	cond.else_body.visit(*this);
+
+	reachable |= reachable_if_true;
+}
+
+void UnreachableCodeRemover::visit(Iteration &iter)
+{
+	TraversingVisitor::visit(iter);
+
+	/* Always consider code after a loop reachable, since there's no checking
+	for whether the loop executes. */
+	reachable = true;
+}
+
+
 bool UnusedTypeRemover::apply(Stage &stage)
 {
 	stage.content.visit(*this);