X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=38218966369213c5fbc8ba802d38bbf1e8bda420;hb=bd8816692056230c36504dcccd76c6946dff47b1;hp=2caa498da0512624a31734232dfca88e870f6b31;hpb=99719790df8a1215465a68c7b1d87a495bff87eb;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 2caa498d..38218966 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -20,12 +20,11 @@ private:
 public:
 	InlineableFunctionLocator();
 
-	const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+	const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 class FunctionInliner: private TraversingVisitor
@@ -50,7 +49,6 @@ private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Return &);
-	using TraversingVisitor::visit;
 };
 
 class ConstantConditionEliminator: private TraversingVisitor
@@ -73,7 +71,6 @@ private:
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	using TraversingVisitor::visit;
 };
 
 class UnusedVariableRemover: private TraversingVisitor
@@ -106,6 +103,7 @@ public:
 
 private:
 	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
@@ -119,7 +117,6 @@ private:
 	void merge_down_variables();
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	using TraversingVisitor::visit;
 };
 
 class UnusedFunctionRemover: private TraversingVisitor
@@ -134,7 +131,6 @@ public:
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 } // namespace SL