X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=a2dd9401256a34c7659800765f8cf25ca56a8313;hb=a048354f5be808c97d92504f9e618f6f5558ce1e;hp=7200679e1813723aca6857a70889663b096955b1;hpb=a29cc14162e911b36d18d1d1896216697c7dc0c1;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 7200679e..a2dd9401 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -12,13 +12,23 @@ class Program;
 
 class ProgramCompiler
 {
-public:
-	struct Formatter: ProgramSyntax::NodeVisitor
+private:
+	struct Visitor: ProgramSyntax::TraversingVisitor
+	{
+		ProgramSyntax::Stage *stage;
+
+		Visitor();
+
+		virtual void apply(ProgramSyntax::Stage &);
+	};
+
+	struct Formatter: Visitor
 	{
 		std::string formatted;
 		unsigned indent;
 		bool parameter_list;
-		bool else_if;
+		unsigned else_if;
+		std::string block_interface;
 
 		Formatter();
 
@@ -29,6 +39,7 @@ public:
 		virtual void visit(ProgramSyntax::MemberAccess &);
 		virtual void visit(ProgramSyntax::UnaryExpression &);
 		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::Assignment &);
 		virtual void visit(ProgramSyntax::FunctionCall &);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::Layout &);
@@ -41,38 +52,42 @@ public:
 		virtual void visit(ProgramSyntax::Return &);
 	};
 
-private:
-	struct VariableResolver: ProgramSyntax::TraversingVisitor
+	struct VariableResolver: Visitor
 	{
 		std::vector<ProgramSyntax::Block *> blocks;
 		ProgramSyntax::StructDeclaration *type;
 		bool anonymous;
+		std::string block_interface;
+		bool record_target;
+		ProgramSyntax::VariableDeclaration *assignment_target;
+		bool self_referencing;
 
 		VariableResolver();
 
+		virtual void apply(ProgramSyntax::Stage &);
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::MemberAccess &);
 		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::Assignment &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
-	struct InterfaceGenerator: ProgramSyntax::TraversingVisitor
+	struct InterfaceGenerator: Visitor
 	{
-		ProgramSyntax::Stage *stage;
 		std::string in_prefix;
 		std::string out_prefix;
 		unsigned scope_level;
-		std::map<std::string, ProgramSyntax::NodePtr<ProgramSyntax::Node> > iface_declarations;
+		std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
 		bool remove_node;
-		std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> > insert_nodes;
+		std::list<ProgramSyntax::Node *> insert_nodes;
 
 		InterfaceGenerator();
 
 		static std::string get_out_prefix(ProgramSyntax::StageType);
-		void visit(ProgramSyntax::Stage &);
+		virtual void apply(ProgramSyntax::Stage &);
 		virtual void visit(ProgramSyntax::Block &);
 		std::string change_prefix(const std::string &, const std::string &) const;
 		bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
@@ -82,45 +97,54 @@ private:
 		virtual void visit(ProgramSyntax::Passthrough &);
 	};
 
-	struct VariableRenamer: ProgramSyntax::TraversingVisitor
+	struct VariableRenamer: Visitor
 	{
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
-	struct UnusedVariableLocator: ProgramSyntax::TraversingVisitor
+	struct UnusedVariableLocator: Visitor
 	{
-		ProgramSyntax::Stage *stage;
+		struct AssignmentList
+		{
+			std::vector<ProgramSyntax::Node *> nodes;
+			bool conditional;
+			bool self_referencing;
+		};
+
+		typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
+
 		std::set<ProgramSyntax::Node *> unused_nodes;
-		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
-		bool assignment;
-		ProgramSyntax::VariableDeclaration *assignment_target;
+		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
+		ProgramSyntax::Node *aggregate;
+		std::vector<BlockAssignmentMap> assignments;
+		ProgramSyntax::Assignment *assignment;
+		bool assignment_target;
 
 		UnusedVariableLocator();
 
-		void visit(ProgramSyntax::Stage &);
+		virtual void apply(ProgramSyntax::Stage &);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::MemberAccess &);
 		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::Assignment &);
+		void record_assignment(ProgramSyntax::VariableDeclaration &, ProgramSyntax::Node &, bool);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
+		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
+		virtual void visit(ProgramSyntax::InterfaceBlock &);
+		virtual void visit(ProgramSyntax::FunctionDeclaration &);
+		void merge_down_assignments();
+		virtual void visit(ProgramSyntax::Conditional &);
+		virtual void visit(ProgramSyntax::Iteration &);
 	};
 
-	struct NodeRemover: ProgramSyntax::TraversingVisitor
+	struct NodeRemover: Visitor
 	{
-		ProgramSyntax::Stage *stage;
 		std::set<ProgramSyntax::Node *> to_remove;
-		unsigned n_removed;
-		bool immutable_block;
-		bool remove_block;
 
-		NodeRemover();
-
-		void visit(ProgramSyntax::Stage &);
 		virtual void visit(ProgramSyntax::Block &);
-		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
-		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
 	ProgramParser parser;
@@ -134,11 +158,15 @@ public:
 	void add_shaders(Program &);
 
 private:
+	static ProgramSyntax::Module *create_builtins_module();
+	static ProgramSyntax::Module &get_builtins_module();
+	static ProgramSyntax::Stage *get_builtins(ProgramSyntax::StageType);
 	void process();
 	void generate(ProgramSyntax::Stage &);
-	void optimize(ProgramSyntax::Stage &);
+	bool optimize(ProgramSyntax::Stage &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
-	static void resolve_variables(ProgramSyntax::Stage &);
+	template<typename T>
+	static void apply(ProgramSyntax::Stage &);
 	std::string create_source(ProgramSyntax::Stage &);
 };