X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=511a460793d4e162fb05c24119c37c8538114322;hb=99719790df8a1215465a68c7b1d87a495bff87eb;hp=1867cc3e2a7d1a909ec3f59368216f6d69e17d23;hpb=48fa4e32b654aa1f2107caf266c3bdda9cc74847;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 1867cc3e..511a4607 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -14,14 +14,11 @@ namespace SL {
 class DeclarationCombiner: private TraversingVisitor
 {
 private:
-	bool toplevel;
 	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 	std::map<std::string, VariableDeclaration *> variables;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	DeclarationCombiner();
-
 	void apply(Stage &);
 
 private:
@@ -31,12 +28,22 @@ private:
 	using TraversingVisitor::visit;
 };
 
+class BlockResolver: private TraversingVisitor
+{
+public:
+	void apply(Stage &s) { visit(s.content); }
+
+private:
+	virtual void visit(Block &);
+	virtual void visit(InterfaceBlock &);
+	using TraversingVisitor::visit;
+};
+
 class VariableResolver: private TraversingVisitor
 {
 private:
-	std::vector<Block *> blocks;
+	Block *builtins;
 	StructDeclaration *type;
-	bool anonymous;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -48,6 +55,8 @@ public:
 	void apply(Stage &);
 
 private:
+	Block *next_block(Block &);
+
 	virtual void visit(Block &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
@@ -81,8 +90,6 @@ private:
 	Stage *stage;
 	std::string in_prefix;
 	std::string out_prefix;
-	unsigned scope_level;
-	Block *current_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -116,7 +123,6 @@ private:
 		FUNCTION
 	};
 
-	unsigned scope_level;
 	DeclarationKind kind;
 	std::set<Node *> ordered_funcs;
 	std::set<Node *> needed_funcs;