X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=2ef4aa7d9b77c5f853968da6e4e9dbc310c9abec;hp=6bac5386828d928ba2d9379366d48b8efb9ae020;hb=7434b80c452eb8f7ac8200a6f693a9eb668421f0;hpb=009918a51aa309eeceb6c02ecaebe45e8d357033

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 6bac5386..2ef4aa7d 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -12,16 +12,32 @@ class Program;
 
 class ProgramCompiler
 {
-public:
-	struct Formatter: ProgramSyntax::NodeVisitor
+private:
+	struct Visitor: ProgramSyntax::TraversingVisitor
 	{
+		typedef void ResultType;
+
+		ProgramSyntax::Stage *stage;
+
+		Visitor();
+
+		virtual void apply(ProgramSyntax::Stage &);
+		void get_result() const { }
+	};
+
+	struct Formatter: Visitor
+	{
+		typedef std::string ResultType;
+
 		std::string formatted;
 		unsigned indent;
 		bool parameter_list;
-		bool else_if;
+		unsigned else_if;
+		std::string block_interface;
 
 		Formatter();
 
+		const std::string &get_result() const { return formatted; }
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::Literal &);
 		virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -29,6 +45,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 +58,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::Context *context;
 		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::ContextType);
-		void visit(ProgramSyntax::Context &);
+		static std::string get_out_prefix(ProgramSyntax::StageType);
+		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 +103,59 @@ 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::Context *context;
+		struct AssignmentList
+		{
+			std::vector<ProgramSyntax::Node *> nodes;
+			bool conditional;
+			bool self_referencing;
+		};
+
+		typedef std::set<ProgramSyntax::Node *> ResultType;
+		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::Context &);
+		virtual void apply(ProgramSyntax::Stage &);
+		const ResultType &get_result() const { return unused_nodes; }
 		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::Context *context;
 		std::set<ProgramSyntax::Node *> to_remove;
-		unsigned n_removed;
-		bool immutable_block;
-		bool remove_block;
 
-		NodeRemover();
+		NodeRemover() { }
+		NodeRemover(const std::set<ProgramSyntax::Node *> &);
 
-		void visit(ProgramSyntax::Context &);
 		virtual void visit(ProgramSyntax::Block &);
-		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
-		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
 	ProgramParser parser;
@@ -134,12 +169,17 @@ 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::Context &);
-	void optimize(ProgramSyntax::Context &);
+	void generate(ProgramSyntax::Stage &);
+	bool optimize(ProgramSyntax::Stage &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
-	static void resolve_variables(ProgramSyntax::Context &);
-	std::string format_context(ProgramSyntax::Context &);
+	template<typename T>
+	static typename T::ResultType apply(ProgramSyntax::Stage &);
+	template<typename T, typename A>
+	static typename T::ResultType apply(ProgramSyntax::Stage &, const A &);
 };
 
 } // namespace GL