X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=35dce52400fc74daf1c71ae538e8affa700121f4;hb=99719790df8a1215465a68c7b1d87a495bff87eb;hp=8bfcac0fd490b85bb2db1c32dfca371a4e786363;hpb=ff8a0248f1a3c0c1f48f670867bc9106c898c55b;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 8bfcac0f..35dce524 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -44,7 +44,9 @@ public:
 class TraversingVisitor: public NodeVisitor
 {
 protected:
-	TraversingVisitor() { }
+	Block *current_block;
+
+	TraversingVisitor(): current_block(0) { }
 
 public:
 	using NodeVisitor::visit;
@@ -66,22 +68,6 @@ 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: private TraversingVisitor
 {
@@ -101,6 +87,9 @@ class NodeRemover: private TraversingVisitor
 private:
 	Stage *stage;
 	const std::set<Node *> *to_remove;
+	std::vector<Block *> blocks;
+	bool anonymous;
+	bool recursive_remove;
 
 public:
 	NodeRemover();
@@ -108,9 +97,13 @@ public:
 	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 &);
 };