1 files changed, 40 insertions, 7 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 42b9f526d0..8632ea0b52 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -198,9 +198,9 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
 
 void ShaderManager::invalidated()
 {
-    qDeleteAll(stockShaders.values());
+    qDeleteAll(stockShaders);
     stockShaders.clear();
-    qDeleteAll(rewrittenShaders.values());
+    qDeleteAll(rewrittenShaders);
     rewrittenShaders.clear();
     delete blitProgram;
     blitProgram = 0;
@@ -487,6 +487,11 @@ void Updater::visitGeometryNode(Node *n)
             if (e->batch)
                 renderer->invalidateBatchAndOverlappingRenderOrders(e->batch);
         }
+        if (n->dirtyState & QSGNode::DirtyMaterial) {
+            Element *e = n->element();
+            if (e->batch && e->batch->isMaterialCompatible(e) == BatchBreaksOnCompare)
+                renderer->invalidateBatchAndOverlappingRenderOrders(e->batch);
+        }
     }
 
     SHADOWNODE_TRAVERSE(n) visitNode(*child);
@@ -1081,6 +1086,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;
         }
     }
 
@@ -1213,10 +1221,7 @@ void Renderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state)
             if (e->isMaterialBlended != blended) {
                 m_rebuild |= Renderer::FullRebuild;
                 e->isMaterialBlended = blended;
-            } else if (e->batch) {
-                if (e->batch->isMaterialCompatible(e) == BatchBreaksOnCompare)
-                    invalidateBatchAndOverlappingRenderOrders(e->batch);
-            } else {
+            } else if (!e->batch) {
                 m_rebuild |= Renderer::BuildBatches;
             }
         }
@@ -2554,8 +2559,15 @@ void Renderer::render()
         QSGNodeDumper::dump(rootNode());
     }
 
-    if (Q_UNLIKELY(debug_render() || debug_build())) {
+    QElapsedTimer timer;
+    quint64 timeRenderLists = 0;
+    quint64 timePrepareOpaque = 0;
+    quint64 timePrepareAlpha = 0;
+    quint64 timeSorting = 0;
+    quint64 timeUploadOpaque = 0;
+    quint64 timeUploadAlpha = 0;
 
+    if (Q_UNLIKELY(debug_render() || debug_build())) {
         QByteArray type("rebuild:");
         if (m_rebuild == 0)
             type += " none";
@@ -2571,6 +2583,7 @@ void Renderer::render()
         }
 
         qDebug() << "Renderer::render()" << this << type;
+        timer.start();
     }
 
     if (m_vao)
@@ -2597,6 +2610,7 @@ void Renderer::render()
             }
         }
     }
+    if (Q_UNLIKELY(debug_render())) timeRenderLists = timer.restart();
 
     for (int i=0; i<m_opaqueBatches.size(); ++i)
         m_opaqueBatches.at(i)->cleanupRemovedElements();
@@ -2609,7 +2623,9 @@ void Renderer::render()
 
     if (m_rebuild & BuildBatches) {
         prepareOpaqueBatches();
+        if (Q_UNLIKELY(debug_render())) timePrepareOpaque = timer.restart();
         prepareAlphaBatches();
+        if (Q_UNLIKELY(debug_render())) timePrepareAlpha = timer.restart();
 
         if (Q_UNLIKELY(debug_build())) {
             qDebug() << "Opaque Batches:";
@@ -2629,8 +2645,11 @@ void Renderer::render()
                 }
             }
         }
+    } else {
+        if (Q_UNLIKELY(debug_render())) timePrepareOpaque = timePrepareAlpha = timer.restart();
     }
 
+
     deleteRemovedElements();
 
     if (m_rebuild != 0) {
@@ -2646,6 +2665,8 @@ void Renderer::render()
         m_zRange = 1.0 / (m_nextRenderOrder);
     }
 
+    if (Q_UNLIKELY(debug_render())) timeSorting = timer.restart();
+
     int largestVBO = 0;
 #ifdef QSG_SEPARATE_INDEX_BUFFER
     int largestIBO = 0;
@@ -2660,6 +2681,8 @@ void Renderer::render()
 #endif
         uploadBatch(b);
     }
+    if (Q_UNLIKELY(debug_render())) timeUploadOpaque = timer.restart();
+
 
     if (Q_UNLIKELY(debug_upload())) qDebug() << "Uploading Alpha Batches:";
     for (int i=0; i<m_alphaBatches.size(); ++i) {
@@ -2670,6 +2693,7 @@ void Renderer::render()
         largestIBO = qMax(b->ibo.size, largestIBO);
 #endif
     }
+    if (Q_UNLIKELY(debug_render())) timeUploadAlpha = timer.restart();
 
     if (largestVBO * 2 < m_vertexUploadPool.size())
         m_vertexUploadPool.resize(largestVBO * 2);
@@ -2680,6 +2704,15 @@ void Renderer::render()
 
     renderBatches();
 
+    if (Q_UNLIKELY(debug_render())) {
+        qDebug(" -> times: build: %d, prepare(opaque/alpha): %d/%d, sorting: %d, upload(opaque/alpha): %d/%d, render: %d",
+               (int) timeRenderLists,
+               (int) timePrepareOpaque, (int) timePrepareAlpha,
+               (int) timeSorting,
+               (int) timeUploadOpaque, (int) timeUploadAlpha,
+               (int) timer.elapsed());
+    }
+
     m_rebuild = 0;
     m_renderOrderRebuildLower = -1;
     m_renderOrderRebuildUpper = -1;