X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=5813e2d9a2a196a6fe759b730641dea562f6bdfa;hb=87f7273a6a7979d07d954de601cb826f97d2e447;hp=f4d1680bccfbe76d1dd3ddb4829390fdee123f95;hpb=7a16308e72aef363727b21348779673edf8e5c07;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index f4d1680b..5813e2d9 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -39,10 +39,6 @@ void InlineableFunctionLocator::visit(FunctionDeclaration &func)
 }
 
 
-FunctionInliner::FunctionInliner():
-	extract_result(0)
-{ }
-
 FunctionInliner::FunctionInliner(const set<FunctionDeclaration *> &in):
 	inlineable(in),
 	extract_result(0)
@@ -217,10 +213,10 @@ UnusedVariableLocator::UnusedVariableLocator():
 	global_scope(true)
 { }
 
-void UnusedVariableLocator::apply(Stage &s)
+const set<Node *> &UnusedVariableLocator::apply(Stage &s)
 {
 	variables.push_back(BlockVariableMap());
-	StageVisitor::apply(s);
+	visit(s.content);
 	BlockVariableMap &global_variables = variables.back();
 	for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
 	{
@@ -233,6 +229,8 @@ void UnusedVariableLocator::apply(Stage &s)
 		}
 	}
 	variables.pop_back();
+
+	return unused_nodes;
 }
 
 void UnusedVariableLocator::visit(VariableReference &var)