X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=48fc742342bdf042aa32bdbd5686e61e1e43bbe0;hb=518f751d385b733adbf43fe4056403740709edec;hp=72035b2c4869504199edda4df59e46958b41fed1;hpb=bf852bf402cf1cc6604816ae958c7dcf2655addc;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 72035b2c..48fc7423 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,6 +11,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Combines multiple declarations of the same identifier into one. */
 class DeclarationCombiner: private TraversingVisitor
 {
 private:
@@ -23,25 +24,45 @@ public:
 
 private:
 	virtual void visit(Block &);
-	virtual void visit(FunctionDeclaration &);
+	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 &);
 };
 
-class BlockResolver: private TraversingVisitor
+/** 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 &);
-	virtual void visit(InterfaceBlock &);
 };
 
+/** Resolves variable references.  Variable references which match the name
+of an interface block are turned into interface block references. */
 class VariableResolver: private TraversingVisitor
 {
 private:
-	Block *builtins;
-	StructDeclaration *type;
+	Stage *stage;
+	std::map<std::string, VariableDeclaration *> *members;
+	RefPtr<InterfaceBlockReference> iface_ref;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -53,10 +74,9 @@ public:
 	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 &);
@@ -65,19 +85,29 @@ private:
 	virtual void visit(InterfaceBlock &);
 };
 
+/** Resolves function declarations and calls. */
 class FunctionResolver: private TraversingVisitor
 {
 private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
+	Stage *stage;
+	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
 
 public:
-	void apply(Stage &s) { s.content.visit(*this); }
+	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.
+
+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:
@@ -85,6 +115,9 @@ private:
 	std::string in_prefix;
 	std::string out_prefix;
 	bool function_scope;
+	InterfaceBlock *iface_block;
+	bool copy_block;
+	Block *iface_target_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -99,44 +132,15 @@ private:
 	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 &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 	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