X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=58bc4ca202e6bdbf60f5d625c1f5b5ba2004ef14;hb=3f44e477f81983c66947fe8a6d8640a3b2f9e0b3;hp=402f07f480b239e39f76dd7334656337955b2ff3;hpb=27e7b634d31498783ea6d24b72f02f3f1287851d;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 402f07f4..58bc4ca2 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -82,6 +82,7 @@ private:
 	bool record_target;
 	bool r_self_referencing;
 	Assignment::Target r_assignment_target;
+	std::vector<VariableDeclaration *> redeclared_builtins;
 	std::set<Node *> nodes_to_remove;
 
 public:
@@ -117,8 +118,15 @@ private:
 		SAME_TYPE
 	};
 
+	struct ArgumentInfo
+	{
+		BasicTypeDeclaration *type;
+		unsigned component_count;
+	};
+
 	Stage *stage;
 	std::vector<BasicTypeDeclaration *> basic_types;
+	NodeList<Statement>::iterator insert_point;
 	bool r_any_resolved;
 
 public:
@@ -136,10 +144,11 @@ private:
 	BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
 	void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
 	bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
+	bool truncate_vector(RefPtr<Expression> &, unsigned);
 	void resolve(Expression &, TypeDeclaration *, bool);
 
+	virtual void visit(Block &);
 	virtual void visit(Literal &);
-	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
@@ -149,6 +158,7 @@ private:
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
 	virtual void visit(TernaryExpression &);
+	void visit_constructor(FunctionCall &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(VariableDeclaration &);