X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=6e96c65eaecb46c0b7d04aaae3027cb063d7bbdf;hb=1a5dafe20e47c764f2914c341fb7b8f1fba59fb8;hp=6fa0b094b584953bff323097b8162b393eb9c01c;hpb=37e2139a0c5721ea7e0104b5afc4cd97ad2dcb6c;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 6fa0b094..6e96c65e 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -29,34 +29,45 @@ class LocationAllocator: private TraversingVisitor
 private:
 	struct Uniform
 	{
-		int location;
-		int desc_set;
-		int bind_point;
-
-		Uniform(): location(-1), desc_set(-1), bind_point(-1) { }
+		int location = -1;
+		int desc_set = 0;
+		int bind_point = -1;
 	};
 
+	Features features;
+	bool alloc_new = true;
 	std::map<std::string, std::set<unsigned> > used_locations;
 	std::map<std::string, Uniform> uniforms;
 	std::map<unsigned, std::set<unsigned> > used_bindings;
 	std::vector<VariableDeclaration *> unplaced_variables;
 	std::vector<VariableDeclaration *> unbound_textures;
-	std::vector<InterfaceBlock *> unbound_blocks;
+	std::vector<VariableDeclaration *> unbound_blocks;
 
 public:
-	void apply(Module &, const Features &);
+	void apply(Module &, const Features &, bool = true);
 private:
 	void apply(Stage &);
 
 	void allocate_locations(const std::string &);
 	void bind_uniform(RefPtr<Layout> &, const std::string &, unsigned);
-	void add_layout_value(RefPtr<Layout> &, const std::string &, unsigned);
 
+	bool visit_uniform(const std::string &, RefPtr<Layout> &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &) { }
 };
 
+/**
+Converts the output depth range to match expectations of the target API.
+*/
+class DepthRangeConverter: private TraversingVisitor
+{
+public:
+	void apply(Stage &, const Features &);
+
+private:
+	virtual void visit(FunctionDeclaration &);
+};
+
 /** Generates default precision declarations or removes precision declarations
 according to the requirements of the target API. */
 class PrecisionConverter: private TraversingVisitor
@@ -76,13 +87,31 @@ private:
 	virtual void visit(VariableDeclaration &);
 };
 
+/** Base class for feature converters. */
+class FeatureConverter: protected TraversingVisitor
+{
+protected:
+	Stage *stage = 0;
+	Features features;
+
+	FeatureConverter() = default;
+
+public:
+	void apply(Stage &, const Features &);
+protected:
+	virtual void apply() = 0;
+
+	void unsupported(const std::string &);
+
+	bool check_version(const Version &) const;
+	bool check_extension(bool Features::*) const;
+};
+
 /** Converts structures of the syntax tree to match a particular set of
 features. */
-class FeatureConverter: private TraversingVisitor
+class StructuralFeatureConverter: public FeatureConverter
 {
 private:
-	Stage *stage = 0;
-	Features features;
 	VariableDeclaration *frag_out = 0;
 	NodeList<Statement>::iterator uniform_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -90,33 +119,40 @@ private:
 	bool r_flattened_interface = false;
 
 public:
-	virtual void apply(Stage &, const Features &);
-
+	void apply(Stage &s, const Features &f) { FeatureConverter::apply(s, f); }
 private:
-	void unsupported(const std::string &);
+	virtual void apply();
 
 	virtual void visit(Block &);
 	virtual void visit(RefPtr<Expression> &);
-	bool check_version(const Version &) const;
-	bool check_extension(bool Features::*) const;
 	bool supports_stage(Stage::Type) const;
 	bool supports_unified_interface_syntax() const;
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Assignment &);
 	bool supports_unified_sampling_functions() const;
 	virtual void visit(FunctionCall &);
+	bool supports_interface_blocks(const std::string &) const;
+	virtual void visit(VariableDeclaration &);
+};
+
+/** Converts qualifiers on variables and blocksto match a particular set of
+features. */
+class QualifierConverter: private FeatureConverter
+{
+public:
+	void apply(Stage &s, const Features &f) { FeatureConverter::apply(s, f); }
+private:
+	virtual void apply();
+
 	bool supports_interface_layouts() const;
 	bool supports_stage_interface_layouts() const;
 	bool supports_centroid_sampling() const;
 	bool supports_sample_sampling() const;
 	bool supports_uniform_location() const;
 	bool supports_binding() const;
-	virtual void visit(VariableDeclaration &);
-	bool supports_interface_blocks(const std::string &) const;
 	bool supports_interface_block_location() const;
-	virtual void visit(InterfaceBlock &);
+	virtual void visit(VariableDeclaration &);
 };
 
 } // namespace SL