X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.h;h=63dfe7bec53ed2e843d2f8857d8cb18b056a6fb2;hb=c4aeeced7b397d46772577775bd3a0d6c4706cba;hp=9520feb6a924c797ee50b7e8a062dbd7b1f74795;hpb=c701c8787cb19fbb6dc5b0bfae1a94e2b07dd549;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.h b/source/glsl/reflect.h
index 9520feb6..63dfe7be 100644
--- a/source/glsl/reflect.h
+++ b/source/glsl/reflect.h
@@ -7,6 +7,11 @@ 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
 {
@@ -27,6 +32,8 @@ private:
 	void compare(Node &, Node &);
 	template<typename T>
 	T *multi_visit(T &);
+	virtual void visit(Literal &);
+	virtual void visit(VariableReference &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
@@ -51,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:
@@ -59,8 +66,9 @@ 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;
@@ -69,6 +77,7 @@ private:
 
 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 &);
@@ -83,6 +92,7 @@ class DependencyCollector: private TraversingVisitor
 private:
 	std::set<Node *> dependencies;
 	std::set<Node *> locals;
+	std::set<FunctionDeclaration *> visited_functions;
 
 public:
 	std::set<Node *> apply(FunctionDeclaration &);
@@ -92,6 +102,7 @@ private:
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
 };
 
 } // namespace SL