X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=d828daa5172716cb6c173e129cd5c8d6126fb452;hp=427f4de2360d977819d02ba9373b5beb7dfee7fe;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=041ba4b1acd55337239c5ce24cc310118c621206

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 427f4de2..d828daa5 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,175 +11,19 @@ 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;
-
-public:
-	void apply(Stage &);
-
-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) { }
-
-	bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
-
-private:
-	virtual void enter(Block &);
-};
-
-/** Resolves types of variables and base types of other types. */
-class TypeResolver: 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;
-
-public:
-	TypeResolver();
-
-	bool apply(Stage &);
-
-private:
-	TypeDeclaration *get_or_create_array_type(TypeDeclaration &);
-	void resolve_type(TypeDeclaration *&, const std::string &, bool);
-	virtual void visit(Block &);
-	virtual void visit(BasicTypeDeclaration &);
-	virtual void visit(ImageTypeDeclaration &);
-	virtual void visit(StructDeclaration &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-	virtual void visit(FunctionDeclaration &);
-};
-
-/** Resolves variable references.  Variable references which match the name
-of an interface block are turned into interface block references. */
-class VariableResolver: private TraversingVisitor
-{
-private:
-	Stage *stage;
-	RefPtr<Expression> r_replacement_expr;
-	bool r_any_resolved;
-	bool record_target;
-	bool r_self_referencing;
-	VariableDeclaration *r_assignment_target;
+	std::set<unsigned> used_ids;
+	std::map<std::string, unsigned> existing_constants;
+	std::vector<VariableDeclaration *> auto_constants;
 
 public:
-	VariableResolver();
-
-	bool apply(Stage &);
+	void apply(Module &, const Features &);
 
 private:
-	virtual void enter(Block &);
-	void visit_and_replace(RefPtr<Expression> &);
-	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
-	virtual void visit(MemberAccess &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
-};
-
-/** Resolves types and lvalueness of expressions. */
-class ExpressionResolver: private TraversingVisitor
-{
-private:
-	enum Compatibility
-	{
-		NOT_COMPATIBLE,
-		LEFT_CONVERTIBLE,
-		RIGHT_CONVERTIBLE,
-		SAME_TYPE
-	};
-
-	Stage *stage;
-	std::vector<BasicTypeDeclaration *> basic_types;
-	bool r_any_resolved;
-
-public:
-	ExpressionResolver();
-
-	bool 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(UnaryExpression &);
-	void visit(BinaryExpression &, bool);
-	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(FunctionCall &);
-	virtual void visit(FunctionDeclaration &);
 };
 
 /** Materializes implicitly declared interfaces.
@@ -193,19 +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;
-	Block *iface_target_block;
+	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: