X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=3d175b42dceda80c71c5052bfbdba0862ea1a4cd;hb=6d11ee7d6137117f441951615cd4cde4d59bf968;hp=b660a0957447f1507fb9aa1b0a8ed5e5dedf28f5;hpb=5f6ee612cb83029de9559bae644c9a3b4e579259;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index b660a095..3d175b42 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -61,6 +61,8 @@ class TypeResolver: private TraversingVisitor
 private:
 	Stage *stage;
 	std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
+	std::map<TypeDeclaration *, TypeDeclaration *> array_types;
+	NodeList<Statement>::iterator type_insert_point;
 
 public:
 	TypeResolver();
@@ -69,6 +71,7 @@ public:
 
 private:
 	TypeDeclaration *resolve_type(const std::string &);
+	virtual void visit(Block &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
@@ -82,9 +85,9 @@ class VariableResolver: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	std::map<std::string, VariableDeclaration *> *r_members;
 	RefPtr<InterfaceBlockReference> r_iface_ref;
 	std::string block_interface;
+	bool r_any_resolved;
 	bool record_target;
 	bool r_self_referencing;
 	VariableDeclaration *r_assignment_target;
@@ -92,7 +95,7 @@ private:
 public:
 	VariableResolver();
 
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	virtual void enter(Block &);
@@ -107,6 +110,52 @@ private:
 	virtual void visit(InterfaceBlock &);
 };
 
+/** Resolves types and lvalueness of expressions. */
+class ExpressionResolver: private TraversingVisitor
+{
+private:
+	enum Compatibility
+	{
+		NOT_COMPATIBLE,
+		LEFT_CONVERTIBLE,
+		RIGHT_CONVERTIBLE,
+		SAME_TYPE
+	};
+
+	Stage *stage;
+	std::vector<BasicTypeDeclaration *> basic_types;
+	bool r_any_resolved;
+
+public:
+	ExpressionResolver();
+
+	bool apply(Stage &);
+
+private:
+	static bool is_scalar(BasicTypeDeclaration &);
+	static bool is_vector_or_matrix(BasicTypeDeclaration &);
+	static BasicTypeDeclaration *get_element_type(BasicTypeDeclaration &);
+	static bool can_convert(BasicTypeDeclaration &, BasicTypeDeclaration &);
+	static Compatibility get_compatibility(BasicTypeDeclaration &, BasicTypeDeclaration &);
+	BasicTypeDeclaration *find_type(BasicTypeDeclaration::Kind, unsigned);
+	BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
+	void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
+	bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
+	void resolve(Expression &, TypeDeclaration *, bool);
+
+	virtual void visit(Literal &);
+	virtual void visit(ParenthesizedExpression &);
+	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(BasicTypeDeclaration &);
+	virtual void visit(VariableDeclaration &);
+};
+
 /** Resolves function declarations and calls. */
 class FunctionResolver: private TraversingVisitor
 {