X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=d828daa5172716cb6c173e129cd5c8d6126fb452;hp=ce95754eb4d68f9d28addbbceaa06839988be507;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=ab5f2e6f1ddd35f8f117460530d76c0ba0c9bc87

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index ce95754e..d828daa5 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,128 +11,58 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: private TraversingVisitor
+/** Assigns IDs to specialization constants with an automatic ID. */
+class ConstantIdAssigner: 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;
+	std::set<unsigned> used_ids;
+	std::map<std::string, unsigned> existing_constants;
+	std::vector<VariableDeclaration *> auto_constants;
 
 public:
-	DeclarationCombiner();
-
-	void apply(Stage &);
+	void apply(Module &, const Features &);
 
 private:
-	virtual void visit(Block &);
-	virtual void visit(FunctionDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	using TraversingVisitor::visit;
 };
 
-class VariableResolver: private TraversingVisitor
-{
-private:
-	std::vector<Block *> blocks;
-	StructDeclaration *type;
-	bool anonymous;
-	std::string block_interface;
-	bool record_target;
-	VariableDeclaration *assignment_target;
-	bool self_referencing;
+/** Materializes implicitly declared interfaces.
 
-public:
-	VariableResolver();
+Out variable declarations inside functions are moved to the global scope.
 
-	void apply(Stage &);
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(VariableReference &);
-	virtual void visit(MemberAccess &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(StructDeclaration &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-	using TraversingVisitor::visit;
-};
-
-class FunctionResolver: private TraversingVisitor
-{
-private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-
-public:
-	void apply(Stage &s) { visit(s.content); }
-
-private:
-	virtual void visit(FunctionCall &);
-	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
-};
+Passthrough statements are processed, generating out variables to match in
+variables and copying values.
 
+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;
-	unsigned scope_level;
-	Block *current_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 &);
+	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 &);
-	virtual void visit(Passthrough &);
-	using TraversingVisitor::visit;
-};
-
-class DeclarationReorderer: private TraversingVisitor
-{
-private:
-	enum DeclarationKind
-	{
-		NO_DECLARATION,
-		LAYOUT,
-		STRUCT,
-		VARIABLE,
-		FUNCTION
-	};
-
-	unsigned scope_level;
-	DeclarationKind kind;
-	std::set<Node *> ordered_funcs;
-	std::set<Node *> needed_funcs;
-
-public:
-	DeclarationReorderer();
-
-	void apply(Stage &s) { visit(s.content); }
-
-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(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
+	virtual void visit(Passthrough &);
 };
 
 } // namespace SL