From 53c15ccd0318a8f5428184eef19a350b6adf4c0c Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 21 Nov 2021 00:11:26 +0200 Subject: [PATCH] Convert some constructors to default member initializers --- source/core/pipelinestate.cpp | 15 --------------- source/core/pipelinestate.h | 18 +++++++++--------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp index 742b2ba9..bc13d3ba 100644 --- 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 fda7ae17..105003d1 100644 --- 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 -- 2.45.2