X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=0a940cea5599a8f1381aadf6b9051989ac607a29;hb=3a1fe833ea04df75449706f1d773f6e65521a392;hp=427f4de2360d977819d02ba9373b5beb7dfee7fe;hpb=041ba4b1acd55337239c5ce24cc310118c621206;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 427f4de2..0a940cea 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -98,7 +98,7 @@ private:
 	bool r_any_resolved;
 	bool record_target;
 	bool r_self_referencing;
-	VariableDeclaration *r_assignment_target;
+	Assignment::Target r_assignment_target;
 
 public:
 	VariableResolver();
@@ -107,14 +107,15 @@ public:
 
 private:
 	virtual void enter(Block &);
-	void visit_and_replace(RefPtr<Expression> &);
+	virtual void visit(RefPtr<Expression> &);
+	void check_assignment_target(Statement *);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
+	void add_to_chain(Assignment::Target::ChainType, unsigned);
 	virtual void visit(MemberAccess &);
-	virtual void visit(UnaryExpression &);
+	virtual void visit(Swizzle &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 };
@@ -157,10 +158,12 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	void visit(BinaryExpression &, bool);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(VariableDeclaration &);
@@ -198,6 +201,7 @@ private:
 	std::string out_prefix;
 	bool function_scope;
 	bool copy_block;
+	std::vector<VariableDeclaration *> declared_inputs;
 	Block *iface_target_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;