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

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 6fa0b094..263be454 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -76,13 +76,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,15 +108,12 @@ 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 &);
@@ -107,6 +122,20 @@ private:
 	virtual void visit(Assignment &);
 	bool supports_unified_sampling_functions() const;
 	virtual void visit(FunctionCall &);
+	virtual void visit(VariableDeclaration &);
+	bool supports_interface_blocks(const std::string &) const;
+	virtual void visit(InterfaceBlock &);
+};
+
+/** 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;
@@ -114,7 +143,6 @@ private:
 	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 &);
 };