X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=eb7d488ae6071faa619f3e374c61084686e028b9;hp=2a36f704603592ab5c60c035605cb1b6e85a5c47;hb=c4aeeced7b397d46772577775bd3a0d6c4706cba;hpb=64d98b0b4fb3214a3ca67ab1b239c120748e8e35

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 2a36f704..eb7d488a 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,75 +11,28 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-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;
-
-public:
-	void apply(Stage &);
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(FunctionDeclaration &);
-	virtual void visit(VariableDeclaration &);
-};
-
-class BlockResolver: private TraversingVisitor
-{
-public:
-	void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-	virtual void enter(Block &);
-	virtual void visit(InterfaceBlock &);
-};
-
-class VariableResolver: private TraversingVisitor
-{
-private:
-	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;
+	std::set<unsigned> used_ids;
+	std::vector<VariableDeclaration *> auto_constants;
 
 public:
-	VariableResolver();
-
-	void apply(Stage &);
+	void apply(Module &, const Features &);
 
 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 &);
 };
 
-class FunctionResolver: private TraversingVisitor
-{
-private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
+/** Materializes implicitly declared interfaces.
 
-public:
-	void apply(Stage &s) { s.content.visit(*this); }
+Out variable declarations inside functions are moved to the global scope.
 
-private:
-	virtual void visit(FunctionCall &);
-	virtual void visit(FunctionDeclaration &);
-};
+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:
@@ -87,8 +40,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;
@@ -103,8 +56,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 &);
@@ -113,37 +66,6 @@ private:
 	virtual void visit(Passthrough &);
 };
 
-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