X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=ddf2b5f629cb0a8aadedd76dd0eab5041dfe1fa4;hb=50ab5ca;hp=bcb70c04c6da49c0df7dc294d37d38139bbd8fda;hpb=8173340a7737e32cb25b21b67049102bd1526beb;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index bcb70c04..ddf2b5f6 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -55,6 +55,30 @@ private:
 	virtual void enter(Block &);
 };
 
+/** Resolves types of variables and base types of other types. */
+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();
+
+	void apply(Stage &);
+
+private:
+	TypeDeclaration *resolve_type(const std::string &);
+	virtual void visit(Block &);
+	virtual void visit(BasicTypeDeclaration &);
+	virtual void visit(ImageTypeDeclaration &);
+	virtual void visit(StructDeclaration &);
+	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
+};
+
 /** Resolves variable references.  Variable references which match the name
 of an interface block are turned into interface block references. */
 class VariableResolver: private TraversingVisitor
@@ -65,8 +89,8 @@ private:
 	RefPtr<InterfaceBlockReference> r_iface_ref;
 	std::string block_interface;
 	bool record_target;
-	VariableDeclaration *r_assignment_target;
 	bool r_self_referencing;
+	VariableDeclaration *r_assignment_target;
 
 public:
 	VariableResolver();
@@ -78,13 +102,56 @@ 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(StructDeclaration &);
+	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	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;
+
+public:
+	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+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 &);
+
+	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
 {
@@ -131,8 +198,8 @@ private:
 	static std::string get_out_prefix(Stage::Type);
 	std::string change_prefix(const std::string &, const std::string &) const;
 	virtual void visit(Block &);
-	bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-	bool generate_interface(InterfaceBlock &);
+	VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+	InterfaceBlock *generate_interface(InterfaceBlock &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);