X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=a4ab75719e29b2416ad36e3be6918ace0beeddd1;hp=511a460793d4e162fb05c24119c37c8538114322;hb=HEAD;hpb=99719790df8a1215465a68c7b1d87a495bff87eb

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 511a4607..aba2c353 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,136 +11,96 @@ 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;
+	std::set<unsigned> used_ids;
+	std::map<std::string, unsigned> existing_constants;
+	std::vector<VariableDeclaration *> auto_constants;
 
 public:
-	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 BlockResolver: private TraversingVisitor
-{
-public:
-	void apply(Stage &s) { visit(s.content); }
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(InterfaceBlock &);
-	using TraversingVisitor::visit;
-};
-
-class VariableResolver: private TraversingVisitor
-{
-private:
-	Block *builtins;
-	StructDeclaration *type;
-	std::string block_interface;
-	bool record_target;
-	VariableDeclaration *assignment_target;
-	bool self_referencing;
-
-public:
-	VariableResolver();
+/** Materializes implicitly declared interfaces.
 
-	void apply(Stage &);
+Out variable declarations inside functions are moved to the global scope.
 
-private:
-	Block *next_block(Block &);
-
-	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 &);
-	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Iteration &);
-	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;
+	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 &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Passthrough &);
-	using TraversingVisitor::visit;
 };
 
-class DeclarationReorderer: private TraversingVisitor
+class LayoutDefaulter: private TraversingVisitor
 {
 private:
-	enum DeclarationKind
-	{
-		NO_DECLARATION,
-		LAYOUT,
-		STRUCT,
-		VARIABLE,
-		FUNCTION
-	};
-
-	DeclarationKind kind;
-	std::set<Node *> ordered_funcs;
-	std::set<Node *> needed_funcs;
+	InterfaceLayout *in_iface = 0;
+	bool need_winding = true;
+	bool need_spacing = true;
 
 public:
-	DeclarationReorderer();
+	void apply(Stage &);
 
-	void apply(Stage &s) { visit(s.content); }
+private:
+	virtual void visit(InterfaceLayout &);
+};
 
+/**
+Assigns sizes to arrays which don't have a size.  Geometry shader inputs are
+sized by topology.  Other arrays are sized by their use with literal indices.
+*/
+class ArraySizer: private TraversingVisitor
+{
 private:
-	virtual void visit(Block &);
+	std::map<VariableDeclaration *, int> max_indices;
+	unsigned input_size = 0;
+	VariableDeclaration *r_declaration;
+
+public:
+	void apply(Stage &);
+
+private:
+	virtual void visit(VariableReference &);
+	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
+	virtual void visit(UnaryExpression&);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(FunctionCall &);
-	virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
-	virtual void visit(StructDeclaration &) { kind = STRUCT; }
+	virtual void visit(InterfaceLayout &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
-	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 } // namespace SL