X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Freflect.h;h=6e6f9d8316bf2c5af1522a03b097bf301c057df6;hp=162ed9c0b8bcf4ddb01daf17724e4308138decd0;hb=HEAD;hpb=8967d38bc578f1653c1dde01dce49a8f7b0c912e

diff --git a/source/glsl/reflect.h b/source/glsl/reflect.h
index 162ed9c0..308d7c80 100644
--- a/source/glsl/reflect.h
+++ b/source/glsl/reflect.h
@@ -7,15 +7,48 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+bool is_scalar(const BasicTypeDeclaration &);
+bool is_vector_or_matrix(const BasicTypeDeclaration &);
+BasicTypeDeclaration *get_element_type(BasicTypeDeclaration &);
+bool can_convert(const BasicTypeDeclaration &, const BasicTypeDeclaration &);
+
+/** Compares two types for equality.  Struct types are compared recursively. */
+class TypeComparer: private NodeVisitor
+{
+private:
+	Node *first = 0;
+	Node *second = 0;
+	unsigned first_tag = 0;
+	bool r_result = false;
+
+	static unsigned next_tag;
+
+public:
+	bool apply(TypeDeclaration &t1, TypeDeclaration &t2) { compare(t1, t2); return r_result; }
+
+private:
+	void compare(Node &, Node &);
+	template<typename T>
+	T *multi_visit(T &);
+	virtual void visit(Literal &);
+	virtual void visit(VariableReference &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(TernaryExpression &);
+	virtual void visit(FunctionCall &);
+	virtual void visit(BasicTypeDeclaration &);
+	virtual void visit(ImageTypeDeclaration &);
+	virtual void visit(StructDeclaration &);
+	virtual void visit(VariableDeclaration &);
+};
+
 /** Determines the number of interface locations required by a variable. */
 class LocationCounter: private NodeVisitor
 {
 private:
-	unsigned r_count;
+	unsigned r_count = 0;
 
 public:
-	LocationCounter();
-
 	unsigned apply(VariableDeclaration &v) { v.visit(*this); return r_count; }
 
 private:
@@ -25,7 +58,7 @@ private:
 	virtual void visit(VariableDeclaration &);
 };
 
-/** Determines the size and alignment of a variable, in bytes. */
+/** Determines the size and alignment of a variable or a type, in bytes. */
 class MemoryRequirementsCalculator: private NodeVisitor
 {
 public:
@@ -33,16 +66,18 @@ public:
 	{
 		unsigned size;
 		unsigned alignment;
+		unsigned stride;
 
-		Result(unsigned s, unsigned a): size(s), alignment(a) { }
+		Result(unsigned s, unsigned a): size(s), alignment(a), stride(s+a-1-(s+a-1)%a) { }
 	};
 private:
-	unsigned r_size;
-	unsigned r_alignment;
-	int r_offset;
+	unsigned r_size = 0;
+	unsigned r_alignment = 1;
+	int r_offset = -1;
 
 public:
 	Result apply(VariableDeclaration &v) { v.visit(*this); return Result(r_size, r_alignment); }
+	Result apply(TypeDeclaration &t) { t.visit(*this); return Result(r_size, r_alignment); }
 
 private:
 	virtual void visit(BasicTypeDeclaration &);
@@ -57,15 +92,32 @@ class DependencyCollector: private TraversingVisitor
 private:
 	std::set<Node *> dependencies;
 	std::set<Node *> locals;
+	std::set<FunctionDeclaration *> visited_functions;
 
 public:
 	std::set<Node *> apply(FunctionDeclaration &);
 
 private:
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
+};
+
+class AssignmentCollector: private TraversingVisitor
+{
+private:
+	bool assignment_target = false;
+	std::set<Node *> assigned_variables;
+
+public:
+	std::set<Node *> apply(Node &);
+
+private:
+	virtual void visit(VariableReference &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(Assignment &);
 };
 
 } // namespace SL