X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=2cf5c54a3735a611070f1314762a165de7a24b6d;hb=1cd0ea7;hp=48fc742342bdf042aa32bdbd5686e61e1e43bbe0;hpb=518f751d385b733adbf43fe4056403740709edec;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 48fc7423..2cf5c54a 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -61,12 +61,12 @@ class VariableResolver: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	std::map<std::string, VariableDeclaration *> *members;
-	RefPtr<InterfaceBlockReference> iface_ref;
+	std::map<std::string, VariableDeclaration *> *r_members;
+	RefPtr<InterfaceBlockReference> r_iface_ref;
 	std::string block_interface;
 	bool record_target;
-	VariableDeclaration *assignment_target;
-	bool self_referencing;
+	bool r_self_referencing;
+	VariableDeclaration *r_assignment_target;
 
 public:
 	VariableResolver();
@@ -78,8 +78,10 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(FunctionCall &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);