X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=52ae136bb61da6053f425cd1d70cc2ad87231be9;hp=d38849012e26fd4569919eaff31588fb144c3559;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=9d9e008291a447b5d192e724e9022180503c8c3e

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index d3884901..52ae136b 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,14 +39,12 @@ private:
 		FUNCTION
 	};
 
-	ScopeType scope;
-	InterfaceLayout *iface_layout;
-	InterfaceBlock *iface_block;
-	VariableDeclaration *variable;
+	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); }
 
 private:
@@ -72,11 +70,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 +113,10 @@ is indicated by a null result type. */
 class ExpressionValidator: private Validator
 {
 private:
-	FunctionDeclaration *current_function;
-	bool constant_expression;
+	FunctionDeclaration *current_function = 0;
+	bool constant_expression = false;
 
 public:
-	ExpressionValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -145,11 +139,9 @@ return statements.  Warnings are given about dead code. */
 class FlowControlValidator: private Validator
 {
 private:
-	bool reachable;
+	bool reachable = true;
 
 public:
-	FlowControlValidator();
-
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -186,15 +178,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;