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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index c04e2f45..0a940cea 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -107,17 +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(Swizzle &);
-	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 };
@@ -165,6 +163,7 @@ private:
 	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 &);
@@ -202,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;