diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-08 10:43:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-08 20:06:40 +0200 |
| commit | a0dfd5e52603f6846b46bcdd80e0ca8008a31d2a (patch) | |
| tree | 5a1f23b6cade92292a9c912c0d7c3eb2182d50eb /src/quick/scenegraph/coreapi/qsgnode.cpp | |
| parent | b2d56db1bd52940577654cfb805f073889080929 (diff) | |
Cleanup: Remove remainders of dirty state usage
Change-Id: I4c379562af27a7eb2a47aee21090eff84fe84c55
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index 04ea8afddf..4c25338ef8 100644 --- 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 |