3 files changed, 19 insertions, 2 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 886e614620..32309c219a 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -1081,6 +1081,9 @@ void Renderer::nodeWasRemoved(Node *node)
         if (e) {
             e->removed = true;
             m_elementsToDelete.add(e);
+
+            if (m_renderNodeElements.isEmpty())
+                m_useDepthBuffer = context()->openglContext()->format().depthBufferSize() > 0;
         }
     }
 
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index 102985f2c7..0c4b2f9af9 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -104,8 +104,11 @@ char const *const *QSGTextMaskShader::attributeNames() const
 }
 
 QSGTextMaskShader::QSGTextMaskShader(QFontEngine::GlyphFormat glyphFormat)
-    : QSGMaterialShader(*new QSGMaterialShaderPrivate),
-      m_glyphFormat(glyphFormat)
+    : QSGMaterialShader(*new QSGMaterialShaderPrivate)
+    , m_matrix_id(-1)
+    , m_color_id(-1)
+    , m_textureScale_id(-1)
+    , m_glyphFormat(glyphFormat)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/textmask.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/textmask.frag"));
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index 422e31ad96..6f4b85a5b9 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -80,6 +80,11 @@ 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)
 {
@@ -260,6 +265,7 @@ protected:
 
 DistanceFieldStyledTextMaterialShader::DistanceFieldStyledTextMaterialShader()
     : QSGDistanceFieldTextMaterialShader()
+    , m_styleColor_id(-1)
 {
 }
 
@@ -330,6 +336,8 @@ protected:
 
 DistanceFieldOutlineTextMaterialShader::DistanceFieldOutlineTextMaterialShader()
     : DistanceFieldStyledTextMaterialShader()
+    , m_outlineAlphaMax0_id(-1)
+    , m_outlineAlphaMax1_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/distancefieldoutlinetext.frag"));
 }
@@ -411,6 +419,7 @@ protected:
 
 DistanceFieldShiftedStyleTextMaterialShader::DistanceFieldShiftedStyleTextMaterialShader()
     : DistanceFieldStyledTextMaterialShader()
+    , m_shift_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/distancefieldshiftedtext.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/distancefieldshiftedtext.frag"));
@@ -489,6 +498,8 @@ private:
 
 QSGHiQSubPixelDistanceFieldTextMaterialShader::QSGHiQSubPixelDistanceFieldTextMaterialShader()
     : QSGDistanceFieldTextMaterialShader()
+    , m_fontScale_id(-1)
+    , m_vecDelta_id(-1)
 {
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/scenegraph/shaders/hiqsubpixeldistancefieldtext.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/scenegraph/shaders/hiqsubpixeldistancefieldtext.frag"));