Rearrange some utility struct constructors

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 596d7e20b071365850cb8d3e894b6eb0db910c1b..43f94e8d4da10422be8a8047c238d9c61b9b6a9a 100644 (file)
--- 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 4c57eaea94844192b29d3a12c9862d754af6dc2c..7b90a2cd676b62a7693b3b8ccdedf94ce2888d8a 100644 (file)
--- 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 ca9c4f3231f8416c69b493ba1a0a218ea200e135..bbd2d620217aeba08602854dcd6887a961463c70 100644 (file)
--- 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 c8324c87460065a2a0d452d455600d017de8eabb..b4d1b3869ae9395c90a5a424fa939ac17fada381 100644 (file)
--- 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;