X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=fc58b2db16134108cf4e7fa653d6c1a6258b9ce3;hp=4359a09fdc59d7d772d19be09f02714dfba0e225;hb=e2ed3de4cbbc682ff490a3b0b760b8a45260f611;hpb=39141d961e55f56d540b3678f9f8fe94868f2652

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 4359a09f..fc58b2db 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,96 +11,18 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-class DeclarationCombiner: private TraversingVisitor
+/** Assigns IDs to specialization constants with an automatic ID. */
+class ConstantIdAssigner: private TraversingVisitor
 {
 private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-	std::map<std::string, VariableDeclaration *> variables;
-	std::set<Node *> nodes_to_remove;
+	std::set<unsigned> used_ids;
+	std::vector<VariableDeclaration *> auto_constants;
 
 public:
-	void apply(Stage &);
+	void apply(Module &, const Features &);
 
 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. */
-class ConstantSpecializer: private TraversingVisitor
-{
-private:
-	const std::map<std::string, int> *values;
-
-public:
-	ConstantSpecializer();
-
-	void apply(Stage &, const std::map<std::string, int> *);
-
-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;
-	Block *builtins;
-	std::map<std::string, VariableDeclaration *> *members;
-	RefPtr<InterfaceBlockReference> iface_ref;
-	std::string block_interface;
-	bool record_target;
-	VariableDeclaration *assignment_target;
-	bool self_referencing;
-
-public:
-	VariableResolver();
-
-	void apply(Stage &);
-
-private:
-	Block *next_block(Block &);
-
-	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.
@@ -114,28 +36,26 @@ Unresolved variables are looked up in the previous stage's out variables. */
 class InterfaceGenerator: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::string in_prefix;
 	std::string out_prefix;
-	bool function_scope;
-	InterfaceBlock *iface_block;
-	bool copy_block;
-	Block *iface_target_block;
+	bool function_scope = false;
+	bool copy_block = false;
+	std::vector<VariableDeclaration *> declared_inputs;
+	Block *iface_target_block = 0;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	InterfaceGenerator();
-
 	void apply(Stage &);
 
 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 &);
@@ -144,39 +64,6 @@ private:
 	virtual void visit(Passthrough &);
 };
 
-/** Reorders declarations to ensure that declarations always appear before
-references. */
-class DeclarationReorderer: private TraversingVisitor
-{
-private:
-	enum DeclarationKind
-	{
-		NO_DECLARATION,
-		LAYOUT,
-		STRUCT,
-		VARIABLE,
-		FUNCTION
-	};
-
-	DeclarationKind kind;
-	std::set<Node *> ordered_funcs;
-	std::set<Node *> needed_funcs;
-
-public:
-	DeclarationReorderer();
-
-	void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(FunctionCall &);
-	virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
-	virtual void visit(StructDeclaration &) { kind = STRUCT; }
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
-	virtual void visit(FunctionDeclaration &);
-};
-
 } // namespace SL
 } // namespace GL
 } // namespace Msp