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

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 978b01e2..7200679e 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -61,7 +61,7 @@ private:
 
 	struct InterfaceGenerator: ProgramSyntax::TraversingVisitor
 	{
-		ProgramSyntax::Context *context;
+		ProgramSyntax::Stage *stage;
 		std::string in_prefix;
 		std::string out_prefix;
 		unsigned scope_level;
@@ -71,8 +71,8 @@ private:
 
 		InterfaceGenerator();
 
-		static std::string get_out_prefix(ProgramSyntax::ContextType);
-		void visit(ProgramSyntax::Context &);
+		static std::string get_out_prefix(ProgramSyntax::StageType);
+		void visit(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 &);
@@ -90,15 +90,25 @@ private:
 
 	struct UnusedVariableLocator: ProgramSyntax::TraversingVisitor
 	{
-		std::set<ProgramSyntax::VariableDeclaration *> unused_variables;
+		ProgramSyntax::Stage *stage;
+		std::set<ProgramSyntax::Node *> unused_nodes;
+		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
+		bool assignment;
+		ProgramSyntax::VariableDeclaration *assignment_target;
 
+		UnusedVariableLocator();
+
+		void visit(ProgramSyntax::Stage &);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::MemberAccess &);
+		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
 	struct NodeRemover: ProgramSyntax::TraversingVisitor
 	{
+		ProgramSyntax::Stage *stage;
 		std::set<ProgramSyntax::Node *> to_remove;
 		unsigned n_removed;
 		bool immutable_block;
@@ -106,8 +116,10 @@ private:
 
 		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 &);
 	};
 
@@ -123,10 +135,11 @@ public:
 
 private:
 	void process();
-	void process(ProgramSyntax::Context &);
+	void generate(ProgramSyntax::Stage &);
+	void optimize(ProgramSyntax::Stage &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
-	static void resolve_variables(ProgramSyntax::Context &);
-	std::string format_context(ProgramSyntax::Context &);
+	static void resolve_variables(ProgramSyntax::Stage &);
+	std::string create_source(ProgramSyntax::Stage &);
 };
 
 } // namespace GL