X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=9ca910becaa38656c15382ca3f8be0a97f499ba4;hb=ab5f2e6f1ddd35f8f117460530d76c0ba0c9bc87;hp=e1c45b5c89de152976cfd94549c018f8e7607116;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index e1c45b5c..9ca910be 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -66,49 +66,42 @@ public:
 	virtual void visit(Return &);
 };
 
-class BlockModifier: public TraversingVisitor
-{
-protected:
-	bool remove_node;
-	std::vector<RefPtr<Statement> > insert_nodes;
-
-	BlockModifier();
-
-	void flatten_block(Block &);
-	void apply_and_increment(Block &, NodeList<Statement>::iterator &);
-
-public:
-	using TraversingVisitor::visit;
-	virtual void visit(Block &);
-};
-
 template<typename T>
-class NodeGatherer: public TraversingVisitor
+class NodeGatherer: private TraversingVisitor
 {
 private:
 	std::vector<T *> nodes;
 
 public:
-	const std::vector<T *> &apply(Stage &s) { visit(s.content); return nodes; }
+	const std::vector<T *> &apply(Stage &s) { nodes.clear(); visit(s.content); return nodes; }
 
+private:
 	using TraversingVisitor::visit;
 	virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
-class NodeRemover: public TraversingVisitor
+class NodeRemover: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	std::set<Node *> to_remove;
+	const std::set<Node *> *to_remove;
+	std::vector<Block *> blocks;
+	bool anonymous;
+	bool recursive_remove;
 
 public:
-	NodeRemover(const std::set<Node *> &);
+	NodeRemover();
 
-	void apply(Stage &);
+	void apply(Stage &, const std::set<Node *> &);
+
+private:
+	void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
 
 	using TraversingVisitor::visit;
 	virtual void visit(Block &);
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(Iteration &);
 };