X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=558803ff8277b74902f3dcff65d2cdc454526c50;hp=fe52ff5aae1878aa0006c2dce8b4c60ca6b4b7af;hb=3fe1aab63922eec99d8bf6fd4fd60bec10df173c;hpb=ea489c40680f9e8e90eeb163d17c8dddd53981d4

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index fe52ff5a..558803ff 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -15,10 +15,10 @@ messages. */
 class Validator: protected TraversingVisitor
 {
 protected:
-	Stage *stage;
-	Node *last_provoker;
+	Stage *stage = 0;
+	Node *last_provoker = 0;
 
-	Validator();
+	Validator() = default;
 
 	void diagnose(Node &, Node &, Diagnostic::Severity, const std::string &);
 	void diagnose(Node &n, Diagnostic::Severity s, const std::string &m) { diagnose(n, n, s, m); }
@@ -39,15 +39,14 @@ private:
 		FUNCTION
 	};
 
-	ScopeType scope;
-	InterfaceLayout *iface_layout;
-	InterfaceBlock *iface_block;
-	VariableDeclaration *variable;
+	Features features;
+	ScopeType scope = GLOBAL;
+	InterfaceLayout *iface_layout = 0;
+	InterfaceBlock *iface_block = 0;
+	VariableDeclaration *variable = 0;
 
 public:
-	DeclarationValidator();
-
-	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+	void apply(Stage &, const Features &);
 
 private:
 	static const char *describe_variable(ScopeType);
@@ -72,11 +71,9 @@ private:
 	std::map<Block *, BlockDeclarationMap> declarations;
 	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, FunctionDeclaration *> overloaded_functions;
-	bool anonymous_block;
+	bool anonymous_block = false;
 
 public:
-	IdentifierValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -117,12 +114,18 @@ is indicated by a null result type. */
 class ExpressionValidator: private Validator
 {
 private:
-	FunctionDeclaration *current_function;
-	bool constant_expression;
+	enum ConstantKind
+	{
+		NOT_CONSTANT,
+		FIXED_CONSTANT,
+		SPEC_CONSTANT
+	};
 
-public:
-	ExpressionValidator();
+	FunctionDeclaration *current_function = 0;
+	bool in_struct = false;
+	ConstantKind constant_expression = NOT_CONSTANT;
 
+public:
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -133,6 +136,7 @@ private:
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
 	virtual void visit(TernaryExpression &);
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);
@@ -140,6 +144,25 @@ private:
 	virtual void visit(Return &);
 };
 
+/** Verifies flow control constructs.  Functions returning non-void must have
+return statements.  Warnings are given about dead code. */
+class FlowControlValidator: private Validator
+{
+private:
+	bool reachable = true;
+
+public:
+	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+private:
+	virtual void visit(Block &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Return &) { reachable = false; }
+	virtual void visit(Jump &) { reachable = false; }
+};
+
 /** Verifies that stage input and output interfaces are valid.  Linked
 variables must have matching types and locations and there must not be any
 overlap in locations. */
@@ -165,15 +188,13 @@ class GlobalInterfaceValidator: private Validator
 private:
 	struct Uniform
 	{
-		Node *node;
-		TypeDeclaration *type;
+		Node *node = 0;
+		TypeDeclaration *type = 0;
 		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) { }
+		int location = -1;
+		unsigned loc_count = 1;
+		int desc_set = 0;
+		int bind_point = -1;
 	};
 
 	std::list<Uniform> uniforms;