X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=aba2c353f827239f7f4aaf3b2d2d73560d680db2;hb=08d3b5a55fad7439b47fc93d8ba604cbeb7e19ca;hp=c7a162e5c6c7e81f81a30d104f0763e81ff8f0ee;hpb=9229a3e70dace406d897148857ed6567986c3bcd;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index c7a162e5..aba2c353 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,218 +11,96 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-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(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 &);
-};
-
-/** Forms links between nested blocks in the syntax tree. */
-class BlockHierarchyResolver: private TraversingVisitor
-{
-private:
-	bool r_any_resolved;
-
-public:
-	BlockHierarchyResolver(): r_any_resolved(false) { }
+/** Materializes implicitly declared interfaces.
 
-	bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
+Out variable declarations inside functions are moved to the global scope.
 
-private:
-	virtual void enter(Block &);
-};
+Passthrough statements are processed, generating out variables to match in
+variables and copying values.
 
-/** Resolves types of variables and base types of other types. */
-class TypeResolver: private TraversingVisitor
+Unresolved variables are looked up in the previous stage's out variables. */
+class InterfaceGenerator: private TraversingVisitor
 {
 private:
-	Stage *stage;
-	std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
-	std::map<TypeDeclaration *, TypeDeclaration *> array_types;
-	NodeList<Statement>::iterator type_insert_point;
-	InterfaceBlock *iface_block;
-	bool r_any_resolved;
+	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:
-	TypeResolver();
-
-	bool apply(Stage &);
+	void apply(Stage &);
 
 private:
-	TypeDeclaration *get_or_create_array_type(TypeDeclaration &);
-	void resolve_type(TypeDeclaration *&, const std::string &, bool);
+	static std::string get_out_prefix(Stage::Type);
+	std::string change_prefix(const std::string &, const std::string &) const;
 	virtual void visit(Block &);
-	virtual void visit(BasicTypeDeclaration &);
-	virtual void visit(ImageTypeDeclaration &);
-	virtual void visit(StructDeclaration &);
+	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(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Passthrough &);
 };
 
-/** Resolves variable references.  Variable references which match the name
-of an interface block are turned into interface block references. */
-class VariableResolver: private TraversingVisitor
+class LayoutDefaulter: private TraversingVisitor
 {
 private:
-	Stage *stage;
-	RefPtr<Expression> r_replacement_expr;
-	bool r_any_resolved;
-	bool record_target;
-	bool r_self_referencing;
-	Assignment::Target r_assignment_target;
+	InterfaceLayout *in_iface = 0;
+	bool need_winding = true;
+	bool need_spacing = true;
 
 public:
-	VariableResolver();
-
-	bool apply(Stage &);
+	void apply(Stage &);
 
 private:
-	virtual void enter(Block &);
-	virtual void visit(RefPtr<Expression> &);
-	void check_assignment_target(Statement *);
-	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
-	void add_to_chain(Assignment::Target::ChainType, unsigned);
-	virtual void visit(MemberAccess &);
-	virtual void visit(Swizzle &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
+	virtual void visit(InterfaceLayout &);
 };
 
-/** Resolves types and lvalueness of expressions. */
-class ExpressionResolver: private TraversingVisitor
+/**
+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:
-	enum Compatibility
-	{
-		NOT_COMPATIBLE,
-		LEFT_CONVERTIBLE,
-		RIGHT_CONVERTIBLE,
-		SAME_TYPE
-	};
-
-	Stage *stage;
-	std::vector<BasicTypeDeclaration *> basic_types;
-	bool r_any_resolved;
+	std::map<VariableDeclaration *, int> max_indices;
+	unsigned input_size = 0;
+	VariableDeclaration *r_declaration;
 
 public:
-	ExpressionResolver();
-
-	bool apply(Stage &);
+	void apply(Stage &);
 
 private:
-	static bool is_scalar(BasicTypeDeclaration &);
-	static bool is_vector_or_matrix(BasicTypeDeclaration &);
-	static BasicTypeDeclaration *get_element_type(BasicTypeDeclaration &);
-	static bool can_convert(BasicTypeDeclaration &, BasicTypeDeclaration &);
-	static Compatibility get_compatibility(BasicTypeDeclaration &, BasicTypeDeclaration &);
-	BasicTypeDeclaration *find_type(BasicTypeDeclaration::Kind, unsigned);
-	BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
-	void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
-	bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
-	void resolve(Expression &, TypeDeclaration *, bool);
-
-	virtual void visit(Literal &);
-	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Swizzle &);
-	virtual void visit(UnaryExpression &);
-	void visit(BinaryExpression &, bool);
+	virtual void visit(UnaryExpression&);
 	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(FunctionCall &);
-	virtual void visit(BasicTypeDeclaration &);
-	virtual void visit(VariableDeclaration &);
-};
-
-/** Resolves function declarations and calls. */
-class FunctionResolver: private TraversingVisitor
-{
-private:
-	Stage *stage;
-	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
-	bool r_any_resolved;
-
-public:
-	bool apply(Stage &);
-
-private:
+	virtual void visit(TernaryExpression &);
 	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:
-	Stage *stage;
-	std::string in_prefix;
-	std::string out_prefix;
-	bool function_scope;
-	bool copy_block;
-	std::vector<VariableDeclaration *> declared_inputs;
-	Block *iface_target_block;
-	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 &);
-	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(InterfaceLayout &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Passthrough &);
 };
 
 } // namespace SL