1 files changed, 15 insertions, 31 deletions

diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index dd2d787495..aa58218505 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -61,19 +61,19 @@ protected:
     void updateColor(const QVector4D &c);
     void updateTextureScale(const QVector2D &ts);
 
-    float m_fontScale;
-    float m_matrixScale;
+    float m_fontScale = 1.0;
+    float m_matrixScale = 1.0;
 
-    int m_matrix_id;
-    int m_textureScale_id;
-    int m_alphaMin_id;
-    int m_alphaMax_id;
-    int m_color_id;
+    int m_matrix_id = -1;
+    int m_textureScale_id = -1;
+    int m_alphaMin_id = -1;
+    int m_alphaMax_id = -1;
+    int m_color_id = -1;
 
     QVector2D m_lastTextureScale;
     QVector4D m_lastColor;
-    float m_lastAlphaMin;
-    float m_lastAlphaMax;
+    float m_lastAlphaMin = -1;
+    float m_lastAlphaMax = -1;
 };
 
 char const *const *QSGDistanceFieldTextMaterialShader::attributeNames() const {
@@ -82,16 +82,6 @@ char const *const *QSGDistanceFieldTextMaterialShader::attributeNames() const {
 }
 
 QSGDistanceFieldTextMaterialShader::QSGDistanceFieldTextMaterialShader()
-    : QSGMaterialShader(),
-      m_fontScale(1.0)
-    , m_matrixScale(1.0)
-    , m_matrix_id(-1)
-    , m_textureScale_id(-1)
-    , m_alphaMin_id(-1)
-    , m_alphaMax_id(-1)
-    , m_color_id(-1)
-    , m_lastAlphaMin(-1)
-    , m_lastAlphaMax(-1)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldtext.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldtext.frag"));
@@ -288,12 +278,11 @@ public:
 protected:
     void initialize() override;
 
-    int m_styleColor_id;
+    int m_styleColor_id = -1;
 };
 
 DistanceFieldStyledTextMaterialShader::DistanceFieldStyledTextMaterialShader()
     : QSGDistanceFieldTextMaterialShader()
-    , m_styleColor_id(-1)
 {
 }
 
@@ -358,14 +347,12 @@ protected:
 
     void updateOutlineAlphaRange(int dfRadius);
 
-    int m_outlineAlphaMax0_id;
-    int m_outlineAlphaMax1_id;
+    int m_outlineAlphaMax0_id = -1;
+    int m_outlineAlphaMax1_id = -1;
 };
 
 DistanceFieldOutlineTextMaterialShader::DistanceFieldOutlineTextMaterialShader()
     : DistanceFieldStyledTextMaterialShader()
-    , m_outlineAlphaMax0_id(-1)
-    , m_outlineAlphaMax1_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldoutlinetext.frag"));
 }
@@ -438,12 +425,11 @@ protected:
 
     void updateShift(qreal fontScale, const QPointF& shift);
 
-    int m_shift_id;
+    int m_shift_id = -1;
 };
 
 DistanceFieldShiftedStyleTextMaterialShader::DistanceFieldShiftedStyleTextMaterialShader()
     : DistanceFieldStyledTextMaterialShader()
-    , m_shift_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldshiftedtext.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/distancefieldshiftedtext.frag"));
@@ -516,14 +502,12 @@ public:
     void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
 
 private:
-    int m_fontScale_id;
-    int m_vecDelta_id;
+    int m_fontScale_id = -1;
+    int m_vecDelta_id = -1;
 };
 
 QSGHiQSubPixelDistanceFieldTextMaterialShader::QSGHiQSubPixelDistanceFieldTextMaterialShader()
     : QSGDistanceFieldTextMaterialShader()
-    , m_fontScale_id(-1)
-    , m_vecDelta_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/qt-project.org/scenegraph/shaders/hiqsubpixeldistancefieldtext.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qt-project.org/scenegraph/shaders/hiqsubpixeldistancefieldtext.frag"));