X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=4f6ee4193bd869ba61ace5191cc1cd9382b14b4e;hb=d03f6d46d0646c53ec3dcd00ddfd6c718ad18720;hp=0638026dba207f2e7d48a209d2a2f3d6ea49c11c;hpb=70d9d2d28e5fe723c6b46894276e4c935f578e2d;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 0638026d..4f6ee419 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -8,6 +8,20 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Assigns offset layout qualifiers to struct members. */
+class StructOrganizer: private TraversingVisitor
+{
+private:
+	int offset = -1;
+
+public:
+	void apply(Stage &s) { s.content.visit(*this); }
+
+private:
+	virtual void visit(StructDeclaration &);
+	virtual void visit(VariableDeclaration &);
+};
+
 /** Assigns location and binding layout qualifiers to interface variables and
 blocks. */
 class LocationAllocator: private TraversingVisitor
@@ -48,14 +62,12 @@ according to the requirements of the target API. */
 class PrecisionConverter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::set<std::string> have_default;
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	PrecisionConverter();
-
 	void apply(Stage &);
 
 private:
@@ -69,26 +81,29 @@ features. */
 class LegacyConverter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	Features features;
-	VariableDeclaration *frag_out;
+	VariableDeclaration *frag_out = 0;
 	NodeList<Statement>::iterator uniform_insert_point;
 	std::set<Node *> nodes_to_remove;
+	RefPtr<Expression> r_replaced_reference;
+	bool r_flattened_interface = false;
 
 public:
-	LegacyConverter();
-
 	virtual void apply(Stage &, const Features &);
 
 private:
 	void unsupported(const std::string &);
 
 	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 &);