From 01c863144c51fd370c75233c5aa5b4add335f4a8 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 3 Apr 2021 23:00:55 +0300
Subject: [PATCH] Rearrange some utility struct constructors

---
 source/glsl/optimize.cpp | 9 ---------
 source/glsl/optimize.h   | 2 +-
 source/glsl/resolve.h    | 2 ++
 source/glsl/syntax.h     | 2 ++
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 596d7e20..43f94e8d 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -368,15 +368,6 @@ void FunctionInliner::visit(Iteration &iter)
 }
 
 
-ExpressionInliner::ExpressionInfo::ExpressionInfo():
-	expression(0),
-	assign_scope(0),
-	inline_point(0),
-	trivial(false),
-	available(true)
-{ }
-
-
 ExpressionInliner::ExpressionInliner():
 	r_ref_info(0),
 	r_any_inlined(false),
diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 4c57eaea..7b90a2cd 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -125,7 +125,7 @@ private:
 		bool trivial;
 		bool available;
 
-		ExpressionInfo();
+		ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
 	};
 
 	std::map<Assignment::Target, ExpressionInfo> expressions;
diff --git a/source/glsl/resolve.h b/source/glsl/resolve.h
index ca9c4f32..bbd2d620 100644
--- a/source/glsl/resolve.h
+++ b/source/glsl/resolve.h
@@ -105,6 +105,8 @@ private:
 	{
 		BasicTypeDeclaration *type;
 		unsigned component_count;
+
+		ArgumentInfo(): type(0), component_count(0) { }
 	};
 
 	Stage *stage;
diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index c8324c87..b4d1b386 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -313,6 +313,8 @@ struct Layout: Node
 		std::string name;
 		bool has_value;
 		int value;
+
+		Qualifier(): has_value(false), value(0) { }
 	};
 
 	std::vector<Qualifier> qualifiers;
-- 
2.43.0