X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=8e83990613343c0fdc8510053ffaac1617d4d283;hb=73bef37da97b6da0b99227f63235cb52c4e56c44;hp=853a399aa2d72c4990112880c8cdb531edd04ecb;hpb=c1b0303f65ee966a973197cbdbf177c571478674;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 853a399a..8e839906 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -1,10 +1,9 @@
 #ifndef MSP_GL_SL_COMPILER_H_
 #define MSP_GL_SL_COMPILER_H_
 
-#include <set>
+#include <vector>
 #include "parser.h"
 #include "program.h"
-#include "resources.h"
 #include "syntax.h"
 
 namespace Msp {
@@ -14,372 +13,6 @@ namespace SL {
 class Compiler
 {
 private:
-	struct Visitor: TraversingVisitor
-	{
-		typedef void ResultType;
-
-		Stage *stage;
-
-		Visitor();
-
-		virtual void apply(Stage &);
-		void get_result() const { }
-	};
-
-	struct BlockModifier: Visitor
-	{
-		bool remove_node;
-		std::vector<RefPtr<Statement> > insert_nodes;
-
-		BlockModifier();
-
-		void flatten_block(Block &);
-		void apply_and_increment(Block &, NodeList<Statement>::iterator &);
-		using Visitor::visit;
-		virtual void visit(Block &);
-	};
-
-	struct Formatter: Visitor
-	{
-		typedef std::string ResultType;
-
-		std::string formatted;
-		unsigned source_index;
-		unsigned source_line;
-		unsigned indent;
-		bool parameter_list;
-		std::string block_interface;
-
-		Formatter();
-
-		virtual void apply(Stage &);
-		const std::string &get_result() const { return formatted; }
-		using Visitor::visit;
-		void append(const std::string &);
-		void append(char);
-		void set_source(unsigned, unsigned);
-		virtual void visit(Block &);
-		virtual void visit(Literal &);
-		virtual void visit(ParenthesizedExpression &);
-		virtual void visit(VariableReference &);
-		virtual void visit(MemberAccess &);
-		virtual void visit(UnaryExpression &);
-		virtual void visit(BinaryExpression &);
-		virtual void visit(Assignment &);
-		virtual void visit(FunctionCall &);
-		virtual void visit(ExpressionStatement &);
-		virtual void visit(Import &);
-		virtual void visit(Precision &);
-		virtual void visit(Layout &);
-		virtual void visit(InterfaceLayout &);
-		virtual void visit(StructDeclaration &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(InterfaceBlock &);
-		virtual void visit(FunctionDeclaration &);
-		virtual void visit(Conditional &);
-		virtual void visit(Iteration &);
-		virtual void visit(Return &);
-		virtual void visit(Jump &);
-	};
-
-	template<typename T>
-	struct NodeGatherer: Visitor
-	{
-		typedef std::vector<T *> ResultType;
-
-		std::vector<T *> nodes;
-
-		const ResultType &get_result() const { return nodes; }
-		using Visitor::visit;
-		virtual void visit(T &n) { nodes.push_back(&n); }
-	};
-
-	struct DeclarationCombiner: BlockModifier
-	{
-		bool toplevel;
-		std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-		std::map<std::string, VariableDeclaration *> variables;
-
-		DeclarationCombiner();
-
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(FunctionDeclaration &);
-		virtual void visit(VariableDeclaration &);
-	};
-
-	struct VariableResolver: Visitor
-	{
-		std::vector<Block *> blocks;
-		StructDeclaration *type;
-		bool anonymous;
-		std::string block_interface;
-		bool record_target;
-		VariableDeclaration *assignment_target;
-		bool self_referencing;
-
-		VariableResolver();
-
-		virtual void apply(Stage &);
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(VariableReference &);
-		virtual void visit(MemberAccess &);
-		virtual void visit(BinaryExpression &);
-		virtual void visit(Assignment &);
-		virtual void visit(StructDeclaration &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(InterfaceBlock &);
-	};
-
-	struct FunctionResolver: Visitor
-	{
-		std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-
-		using Visitor::visit;
-		virtual void visit(FunctionCall &);
-		virtual void visit(FunctionDeclaration &);
-	};
-
-	struct InterfaceGenerator: BlockModifier
-	{
-		std::string in_prefix;
-		std::string out_prefix;
-		unsigned scope_level;
-		std::map<std::string, RefPtr<VariableDeclaration> > iface_declarations;
-
-		InterfaceGenerator();
-
-		static std::string get_out_prefix(StageType);
-		virtual void apply(Stage &);
-		using Visitor::visit;
-		virtual void visit(Block &);
-		std::string change_prefix(const std::string &, const std::string &) const;
-		bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-		ExpressionStatement &insert_assignment(const std::string &, Expression *);
-		virtual void visit(VariableReference &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(Passthrough &);
-	};
-
-	struct DeclarationReorderer: Visitor
-	{
-		enum DeclarationKind
-		{
-			NO_DECLARATION,
-			LAYOUT,
-			STRUCT,
-			VARIABLE,
-			FUNCTION
-		};
-
-		unsigned scope_level;
-		DeclarationKind kind;
-		std::set<Node *> ordered_funcs;
-		std::set<Node *> needed_funcs;
-
-		DeclarationReorderer();
-
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(FunctionCall &);
-		virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
-		virtual void visit(StructDeclaration &) { kind = STRUCT; }
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
-		virtual void visit(FunctionDeclaration &);
-	};
-
-	struct InlineableFunctionLocator: Visitor
-	{
-		typedef std::set<FunctionDeclaration *> ResultType;
-
-		std::map<FunctionDeclaration *, unsigned> refcounts;
-		std::set<FunctionDeclaration *> inlineable;
-		FunctionDeclaration *in_function;
-
-		InlineableFunctionLocator();
-
-		const ResultType &get_result() const { return inlineable; }
-		using Visitor::visit;
-		virtual void visit(FunctionCall &);
-		virtual void visit(FunctionDeclaration &);
-	};
-
-	struct FunctionInliner: Visitor
-	{
-		std::set<FunctionDeclaration *> inlineable;
-		unsigned extract_result;
-		RefPtr<Expression> inline_result;
-
-		FunctionInliner();
-		FunctionInliner(const std::set<FunctionDeclaration *> &);
-
-		void visit_and_inline(RefPtr<Expression> &);
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(UnaryExpression &);
-		virtual void visit(BinaryExpression &);
-		virtual void visit(MemberAccess &);
-		virtual void visit(FunctionCall &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(Return &);
-	};
-
-	struct ExpressionEvaluator: NodeVisitor
-	{
-		typedef std::map<VariableDeclaration *, Expression *> ValueMap;
-
-		const ValueMap *variable_values;
-		float result;
-		bool result_valid;
-
-		ExpressionEvaluator();
-		ExpressionEvaluator(const ValueMap &);
-
-		using NodeVisitor::visit;
-		virtual void visit(Literal &);
-		virtual void visit(ParenthesizedExpression &);
-		virtual void visit(VariableReference &);
-		virtual void visit(UnaryExpression &);
-		virtual void visit(BinaryExpression &);
-	};
-
-	struct ConstantConditionEliminator: BlockModifier
-	{
-		unsigned scope_level;
-		bool record_only;
-		ExpressionEvaluator::ValueMap variable_values;
-
-		ConstantConditionEliminator();
-
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(UnaryExpression &);
-		virtual void visit(Assignment &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(Conditional &);
-		virtual void visit(Iteration &);
-	};
-
-	struct UnusedVariableLocator: Visitor
-	{
-		struct VariableInfo
-		{
-			bool local;
-			std::vector<Node *> assignments;
-			bool conditionally_assigned;
-			bool referenced;
-
-			VariableInfo();
-		};
-
-		typedef std::set<Node *> ResultType;
-		typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
-
-		std::set<Node *> unused_nodes;
-		std::map<VariableDeclaration *, Node *> aggregates;
-		Node *aggregate;
-		std::vector<BlockVariableMap> variables;
-		Assignment *assignment;
-		bool assignment_target;
-		bool assign_to_subscript;
-		bool global_scope;
-
-		UnusedVariableLocator();
-
-		virtual void apply(Stage &);
-		const ResultType &get_result() const { return unused_nodes; }
-		using Visitor::visit;
-		virtual void visit(VariableReference &);
-		virtual void visit(MemberAccess &);
-		virtual void visit(BinaryExpression &);
-		virtual void visit(Assignment &);
-		void record_assignment(VariableDeclaration &, Node &, bool);
-		void clear_assignments(VariableInfo &, bool);
-		virtual void visit(ExpressionStatement &);
-		virtual void visit(StructDeclaration &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(InterfaceBlock &);
-		virtual void visit(FunctionDeclaration &);
-		void merge_down_variables();
-		virtual void visit(Conditional &);
-		virtual void visit(Iteration &);
-	};
-
-	struct UnusedFunctionLocator: Visitor
-	{
-		typedef std::set<Node *> ResultType;
-
-		std::set<Node *> unused_nodes;
-		std::set<FunctionDeclaration *> used_definitions;
-
-		const ResultType &get_result() const { return unused_nodes; }
-		using Visitor::visit;
-		virtual void visit(FunctionCall &);
-		virtual void visit(FunctionDeclaration &);
-	};
-
-	struct NodeRemover: Visitor
-	{
-		std::set<Node *> to_remove;
-
-		NodeRemover() { }
-		NodeRemover(const std::set<Node *> &);
-
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(VariableDeclaration &);
-		virtual void visit(Iteration &);
-	};
-
-	struct PrecisionRemover: BlockModifier
-	{
-		using Visitor::visit;
-		virtual void visit(Precision &);
-		virtual void visit(VariableDeclaration &);
-	};
-
-	struct DefaultPrecisionGenerator: BlockModifier
-	{
-		bool toplevel;
-		std::set<std::string> have_default;
-
-		DefaultPrecisionGenerator();
-
-		using Visitor::visit;
-		virtual void visit(Block &);
-		virtual void visit(Precision &);
-		virtual void visit(VariableDeclaration &);
-	};
-
-	struct LegacyConverter: BlockModifier
-	{
-		GLApi target_api;
-		Version target_version;
-		std::string type;
-		VariableDeclaration *frag_out;
-
-		LegacyConverter();
-		LegacyConverter(const Version &);
-
-		bool check_version(const Version &) const;
-		bool check_extension(const Extension &) const;
-		using Visitor::visit;
-		bool supports_unified_interface_syntax() const;
-		virtual void visit(VariableReference &);
-		virtual void visit(Assignment &);
-		bool supports_unified_sampling_functions() const;
-		virtual void visit(FunctionCall &);
-		bool supports_interface_layouts() const;
-		bool supports_centroid_sampling() const;
-		bool supports_sample_sampling() const;
-		virtual void visit(VariableDeclaration &);
-		bool supports_interface_blocks(const std::string &) const;
-		virtual void visit(InterfaceBlock &);
-	};
-
-	Resources *resources;
 	Module *module;
 	std::vector<std::string> imported_names;
 
@@ -387,27 +20,23 @@ public:
 	Compiler();
 	~Compiler();
 
-	void compile(const std::string &, const std::string & = "<string>");
-	void compile(IO::Base &, Resources * = 0, const std::string & = "<file>");
-	void compile(IO::Base &, const std::string &);
+private:
+	void clear();
+public:
+	void set_source(const std::string &, const std::string & = "<string>");
+	void load_source(IO::Base &, DataFile::Collection * = 0, const std::string & = "<file>");
+	void load_source(IO::Base &, const std::string &);
+	void compile();
 	void add_shaders(Program &);
 
 private:
-	static Module *create_builtins_module();
-	static Module &get_builtins_module();
-	static Stage *get_builtins(StageType);
-	void append_module(Module &);
+	void append_module(Module &, DataFile::Collection *);
 	void append_stage(Stage &);
-	void process();
-	void import(const std::string &);
+	void import(DataFile::Collection *, const std::string &);
 	void generate(Stage &);
 	bool optimize(Stage &);
 	void finalize(Stage &);
 	static void inject_block(Block &, const Block &);
-	template<typename T>
-	static typename T::ResultType apply(Stage &);
-	template<typename T, typename A>
-	static typename T::ResultType apply(Stage &, const A &);
 };
 
 } // namespace SL