Convert some constructors to default member initializers

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 742b2ba94c2723ccb917c1f181c10889e9205b16..bc13d3ba562b51535b749320b7341ba64eaf64e9 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -102,20 +102,5 @@ void PipelineState::set_blend(const Blend *b)
        set(blend, b, BLEND);
 }
 
-
-PipelineState::BoundTexture::BoundTexture(unsigned b):
-       binding(b),
-       changed(false),
-       texture(0),
-       sampler(0)
-{ }
-
-
-PipelineState::BoundUniformBlock::BoundUniformBlock(int b):
-       binding(b),
-       changed(false),
-       block(0)
-{ }
-
 } // namespace GL
 } // namespace Msp

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index fda7ae1753853f43986a6d550fea58516c100120..105003d1750de54720d9071360eaf7f1236a9cb7 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -33,21 +33,21 @@ class PipelineState: public PipelineStateBackend
 private:
        struct BoundTexture
        {
-               unsigned binding;
-               mutable bool changed;
-               const Texture *texture;
-               const Sampler *sampler;
+               unsigned binding = 0;
+               mutable bool changed = false;
+               const Texture *texture = 0;
+               const Sampler *sampler = 0;
 
-               BoundTexture(unsigned);
+               BoundTexture(unsigned b): binding(b) { }
        };
 
        struct BoundUniformBlock
        {
-               int binding;
-               mutable bool changed;
-               const UniformBlock *block;
+               int binding = 0;
+               mutable bool changed = false;
+               const UniformBlock *block = 0;
 
-               BoundUniformBlock(int);
+               BoundUniformBlock(int b): binding(b) { }
        };
 
        enum ChangeMask