Cleanup: Remove remainders of dirty state usage

Change-Id: I4c379562af27a7eb2a47aee21090eff84fe84c55
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 04ea8af..4c25338 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1008,7 +1008,6 @@ void QSGGeometryNode::setOpaqueMaterial(QSGMaterial *material)
  */
 QSGMaterial *QSGGeometryNode::activeMaterial() const
 {
-    Q_ASSERT_X(dirtyState() == 0, "QSGGeometryNode::activeMaterial()", "function assumes that all dirty states are cleaned up");
     if (m_opaque_material && m_opacity > 0.999)
         return m_opaque_material;
     return m_material;
@@ -1494,7 +1493,6 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n)
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
-    d << "dirty=" << hex << (int) n->dirtyState() << dec;
     return d;
 }
 
@@ -1515,7 +1513,7 @@ QDebug operator<<(QDebug d, const QSGClipNode *n)
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
-    d << "dirty=" << hex << (int) n->dirtyState() << dec << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
+    d << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
     return d;
 }
 
@@ -1537,7 +1535,7 @@ QDebug operator<<(QDebug d, const QSGTransformNode *n)
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
-    d << "dirty=" << hex << (int) n->dirtyState() << dec << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
+    d << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
     d << ')';
     return d;
 }
@@ -1556,7 +1554,6 @@ QDebug operator<<(QDebug d, const QSGOpacityNode *n)
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
-    d << "dirty=" << hex << (int) n->dirtyState() << dec;
     d << ')';
     return d;
 }
@@ -1568,8 +1565,7 @@ QDebug operator<<(QDebug d, const QSGRootNode *n)
         d << "RootNode(null)";
         return d;
     }
-    d << "RootNode" << hex << (void *) n << "dirty=" << (int) n->dirtyState() << dec
-      << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
+    d << "RootNode" << hex << (void *) n << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
     d << QSGNodePrivate::description(n);
 #endif
@@ -1603,7 +1599,6 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         break;
     case QSGNode::RenderNodeType:
         d << "RenderNode(" << hex << (void *) n << dec
-          << "dirty=" << hex << (int) n->dirtyState()
           << "flags=" << (int) n->flags() << dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION
@@ -1613,7 +1608,6 @@ QDebug operator<<(QDebug d, const QSGNode *n)
         break;
     default:
         d << "Node(" << hex << (void *) n << dec
-          << "dirty=" << hex << (int) n->dirtyState()
           << "flags=" << (int) n->flags() << dec
           << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
 #ifdef QSG_RUNTIME_DESCRIPTION

diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index be93fd1..86977f7 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -145,9 +145,9 @@ public:
 
     inline NodeType type() const { return m_type; }
 
-    void clearDirty() { m_dirtyState = 0; }
+    QT_DEPRECATED void clearDirty() { }
     void markDirty(DirtyState bits);
-    DirtyState dirtyState() const { return m_dirtyState; }
+    QT_DEPRECATED DirtyState dirtyState() const { return 0; }
 
     virtual bool isSubtreeBlocked() const;
 

diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
index 51cc844..e290eb3 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
@@ -113,9 +113,6 @@ bool QSGNodeUpdater::isNodeBlocked(QSGNode *node, QSGNode *root) const
 
 void QSGNodeUpdater::enterTransformNode(QSGTransformNode *t)
 {
-    if (t->dirtyState() & QSGNode::DirtyMatrix)
-        ++m_force_update;
-
 #ifdef QSG_UPDATER_DEBUG
     qDebug() << "enter transform:" << t << "force=" << m_force_update;
 #endif
@@ -143,9 +140,6 @@ void QSGNodeUpdater::leaveTransformNode(QSGTransformNode *t)
     qDebug() << "leave transform:" << t;
 #endif
 
-    if (t->dirtyState() & QSGNode::DirtyMatrix)
-        --m_force_update;
-
     if (!t->matrix().isIdentity()) {
         m_combined_matrix_stack.pop_back();
     }
@@ -217,9 +211,6 @@ void QSGNodeUpdater::leaveRenderNode(QSGRenderNode *r)
 
 void QSGNodeUpdater::enterOpacityNode(QSGOpacityNode *o)
 {
-    if (o->dirtyState() & QSGNode::DirtyOpacity)
-        ++m_force_update;
-
     qreal opacity = m_opacity_stack.last() * o->opacity();
     o->setCombinedOpacity(opacity);
     m_opacity_stack.add(opacity);
@@ -252,15 +243,11 @@ void QSGNodeUpdater::visitNode(QSGNode *n)
     qDebug() << "enter:" << n;
 #endif
 
-    if (!n->dirtyState() && !m_force_update)
+    if (!m_force_update)
         return;
     if (n->isSubtreeBlocked())
         return;
 
-    bool forceUpdate = n->dirtyState() & (QSGNode::DirtyNodeAdded | QSGNode::DirtyForceUpdate);
-    if (forceUpdate)
-        ++m_force_update;
-
     switch (n->type()) {
     case QSGNode::TransformNodeType: {
         QSGTransformNode *t = static_cast<QSGTransformNode *>(n);
@@ -296,11 +283,6 @@ void QSGNodeUpdater::visitNode(QSGNode *n)
         visitChildren(n);
         break;
     }
-
-    if (forceUpdate)
-        --m_force_update;
-
-    n->clearDirty();
 }
 
 QT_END_NAMESPACE

diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index ebfd4dc..f02cc83 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -99,8 +99,6 @@ protected:
     void addNodesToPreprocess(QSGNode *node);
     void removeNodesToPreprocess(QSGNode *node);
 
-    void markNodeDirtyState(QSGNode *node, QSGNode::DirtyState state) { node->m_dirtyState |= state; }
-
     QMatrix4x4 m_current_projection_matrix;
     QMatrix4x4 m_current_model_view_matrix;
     qreal m_current_opacity;