X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=acb5b4e4086810972263a03ad5f2cb065fc205d1;hb=8f5f54a9e165dae424e5b0bb8e488c3d01849bf6;hp=6cd5675a07f691f413c8786f2143fb5d2ebb3708;hpb=7a62eb7f7550df161656616f2ece5a094b754392;p=libs%2Fgl.git

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 6cd5675a..acb5b4e4 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,55 @@ private:
 	virtual void visit(Assignment &);
 	virtual void visit(TernaryExpression &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Return &);
+};
+
+class StageInterfaceValidator: private Validator
+{
+private:
+	std::map<std::string, std::map<unsigned, VariableDeclaration *> > used_locations;
+
+public:
+	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+private:
+	int get_location(const Layout &);
+
+	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &) { }
+};
+
+class GlobalInterfaceValidator: private Validator
+{
+private:
+	struct Uniform
+	{
+		Node *node;
+		TypeDeclaration *type;
+		std::string name;
+		int location;
+		unsigned loc_count;
+		int desc_set;
+		int bind_point;
+
+		Uniform(): node(0), type(0), location(-1), loc_count(1), desc_set(0), bind_point(-1) { }
+	};
+
+	std::list<Uniform> uniforms;
+	std::map<std::string, const Uniform *> used_names;
+	std::map<unsigned, const Uniform *> used_locations;
+	std::map<unsigned, std::map<unsigned, const Uniform *> > used_bindings;
+
+public:
+	void apply(Module &);
+
+private:
+	void check_uniform(const Uniform &);
+
+	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &) { }
 };
 
 } // namespace SL