X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;fp=source%2Fglsl%2Fvalidate.h;h=f1e3f5126eb8422624524979a8768165b5451396;hp=6cd5675a07f691f413c8786f2143fb5d2ebb3708;hb=f2ad2730858046b08e8147297fa01bf3499b86a3;hpb=aa834c69698b5f0804a19fee4ec2e632a51e38c2

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 6cd5675a..f1e3f512 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -24,21 +24,39 @@ protected:
 	void add_info(Node &, const std::string &);
 };
 
-class TypeValidator: private Validator
+class DeclarationValidator: private Validator
 {
 private:
-	bool in_struct;
+	enum ScopeType
+	{
+		GLOBAL,
+		STRUCT,
+		INTERFACE_BLOCK,
+		FUNCTION_PARAM,
+		FUNCTION
+	};
+
+	ScopeType scope;
+	InterfaceLayout *iface_layout;
+	InterfaceBlock *iface_block;
+	VariableDeclaration *variable;
 
 public:
-	TypeValidator();
+	DeclarationValidator();
 
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
+	static const char *describe_variable(ScopeType);
+
+	virtual void visit(Layout &);
+	virtual void visit(InterfaceLayout &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &);
 };
 
 class IdentifierValidator: private Validator
@@ -90,7 +108,12 @@ private:
 
 class ExpressionValidator: private Validator
 {
+private:
+	FunctionDeclaration *current_function;
+
 public:
+	ExpressionValidator();
+
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -100,6 +123,8 @@ private:
 	virtual void visit(Assignment &);
 	virtual void visit(TernaryExpression &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Return &);
 };
 
 } // namespace SL