X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=a4ab75719e29b2416ad36e3be6918ace0beeddd1;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=b2cfadc428f6184e7e44b74c310e300e7cc122c4;hpb=d9d7ab44d5f88c4537906e77c49db06d6bdc099c;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index b2cfadc4..a4ab7571 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -14,8 +14,13 @@ namespace SL {
 /** Assigns IDs to specialization constants with an automatic ID. */
 class ConstantIdAssigner: private TraversingVisitor
 {
+private:
+	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(VariableDeclaration &);
@@ -32,20 +37,18 @@ 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;
-	bool copy_block;
+	bool function_scope = false;
+	bool copy_block = false;
 	std::vector<VariableDeclaration *> declared_inputs;
-	Block *iface_target_block;
+	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:
@@ -53,15 +56,39 @@ private:
 	std::string change_prefix(const std::string &, const std::string &) const;
 	virtual void visit(Block &);
 	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(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Passthrough &);
 };
 
+/**
+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:
+	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 &);
+	virtual void visit(VariableDeclaration &);
+};
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp