X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=ef8ca10e35b198b5da4a38abc09708b08455f267;hb=bbe2fb7bc1384d7683f1795b5cfa9168df18c580;hp=bcb70c04c6da49c0df7dc294d37d38139bbd8fda;hpb=8173340a7737e32cb25b21b67049102bd1526beb;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index bcb70c04..ef8ca10e 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,23 +11,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-class DeclarationCombiner: private TraversingVisitor
-{
-private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-	std::map<std::string, VariableDeclaration *> variables;
-	std::set<Node *> nodes_to_remove;
-
-public:
-	void apply(Stage &);
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(FunctionDeclaration &) { }
-};
-
 /** Manipulates specialization constants.  If values are specified, turns
 specialization constants into normal constants.  Without values assigns
 automatic constant_ids to specialization constants. */
@@ -45,61 +28,6 @@ private:
 	virtual void visit(VariableDeclaration &);
 };
 
-/** Forms links between nested blocks in the syntax tree. */
-class BlockHierarchyResolver: private TraversingVisitor
-{
-public:
-	void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-	virtual void enter(Block &);
-};
-
-/** Resolves variable references.  Variable references which match the name
-of an interface block are turned into interface block references. */
-class VariableResolver: private TraversingVisitor
-{
-private:
-	Stage *stage;
-	std::map<std::string, VariableDeclaration *> *r_members;
-	RefPtr<InterfaceBlockReference> r_iface_ref;
-	std::string block_interface;
-	bool record_target;
-	VariableDeclaration *r_assignment_target;
-	bool r_self_referencing;
-
-public:
-	VariableResolver();
-
-	void apply(Stage &);
-
-private:
-	virtual void enter(Block &);
-	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
-	virtual void visit(MemberAccess &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(StructDeclaration &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-};
-
-/** Resolves function declarations and calls. */
-class FunctionResolver: private TraversingVisitor
-{
-private:
-	Stage *stage;
-	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
-
-public:
-	void apply(Stage &);
-
-private:
-	virtual void visit(FunctionCall &);
-	virtual void visit(FunctionDeclaration &);
-};
-
 /** Materializes implicitly declared interfaces.
 
 Out variable declarations inside functions are moved to the global scope.
@@ -115,8 +43,8 @@ private:
 	std::string in_prefix;
 	std::string out_prefix;
 	bool function_scope;
-	InterfaceBlock *iface_block;
 	bool copy_block;
+	std::vector<VariableDeclaration *> declared_inputs;
 	Block *iface_target_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
@@ -131,8 +59,8 @@ private:
 	static std::string get_out_prefix(Stage::Type);
 	std::string change_prefix(const std::string &, const std::string &) const;
 	virtual void visit(Block &);
-	bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-	bool generate_interface(InterfaceBlock &);
+	VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+	InterfaceBlock *generate_interface(InterfaceBlock &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);