X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=6b1e1cdafe79f9be2ad0df6858cd89b95942e859;hb=03de23d42e418f5d7d86c1fbe8665aef1f0a36bd;hp=a84ccb8ac001d9a6fe49d93cab4f47998591ad9d;hpb=ff072e148afae24018696c03a413c9ae2da6c929;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index a84ccb8a..6b1e1cda 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -26,6 +26,19 @@ private:
 		void get_result() const { }
 	};
 
+	struct BlockModifier: Visitor
+	{
+		bool remove_node;
+		std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+
+		BlockModifier();
+
+		void flatten_block(ProgramSyntax::Block &);
+		void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+		using Visitor::visit;
+		virtual void visit(ProgramSyntax::Block &);
+	};
+
 	struct Formatter: Visitor
 	{
 		typedef std::string ResultType;
@@ -52,6 +65,7 @@ private:
 		virtual void visit(ProgramSyntax::FunctionCall &);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::Import &);
+		virtual void visit(ProgramSyntax::Precision &);
 		virtual void visit(ProgramSyntax::Layout &);
 		virtual void visit(ProgramSyntax::InterfaceLayout &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
@@ -76,12 +90,11 @@ private:
 		virtual void visit(T &n) { nodes.push_back(&n); }
 	};
 
-	struct DeclarationCombiner: Visitor
+	struct DeclarationCombiner: BlockModifier
 	{
 		bool toplevel;
 		std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
 		std::map<std::string, ProgramSyntax::VariableDeclaration *> variables;
-		bool remove_node;
 
 		DeclarationCombiner();
 
@@ -124,19 +137,6 @@ private:
 		virtual void visit(ProgramSyntax::FunctionDeclaration &);
 	};
 
-	struct BlockModifier: Visitor
-	{
-		bool remove_node;
-		std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
-
-		BlockModifier();
-
-		void flatten_block(ProgramSyntax::Block &);
-		void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
-		using Visitor::visit;
-		virtual void visit(ProgramSyntax::Block &);
-	};
-
 	struct InterfaceGenerator: BlockModifier
 	{
 		std::string in_prefix;
@@ -326,6 +326,26 @@ private:
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
+	struct PrecisionRemover: BlockModifier
+	{
+		using Visitor::visit;
+		virtual void visit(ProgramSyntax::Precision &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+	};
+
+	struct DefaultPrecisionGenerator: BlockModifier
+	{
+		bool toplevel;
+		std::set<std::string> have_default;
+
+		DefaultPrecisionGenerator();
+
+		using Visitor::visit;
+		virtual void visit(ProgramSyntax::Block &);
+		virtual void visit(ProgramSyntax::Precision &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+	};
+
 	struct LegacyConverter: BlockModifier
 	{
 		GLApi target_api;
@@ -368,6 +388,7 @@ private:
 	void import(const std::string &);
 	void generate(ProgramSyntax::Stage &);
 	bool optimize(ProgramSyntax::Stage &);
+	void finalize(ProgramSyntax::Stage &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
 	template<typename T>
 	static typename T::ResultType apply(ProgramSyntax::Stage &);