Made QSGNode flags togglable and added StaticSubtreeGeometry.

The UsePreprocess and ChildrenDoNotOverlap flags could previously
only be set during node initialization. They can now be toggled.
This change also introduces the StaticSubtreeGeometry flag which is
meant to be used to indicate that all the nodes in the sub-tree
have static matrices and vertex data.

Change-Id: I3b182b81f7010aea636f8f654ef22dab19bc6b29
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
index 56a6e0e5d9..0bed1b8683 100644
--- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@ -175,18 +175,18 @@ QSGDefaultRenderer::QSGDefaultRenderer(QSGContext *context)
 #endif
 }
 
-void QSGDefaultRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyFlags flags)
+void QSGDefaultRenderer::nodeChanged(QSGNode *node, QSGNode::DirtyState state)
 {
-    QSGRenderer::nodeChanged(node, flags);
+    QSGRenderer::nodeChanged(node, state);
 
-    quint32 rebuildFlags = QSGNode::DirtyNodeAdded | QSGNode::DirtyNodeRemoved
-                         | QSGNode::DirtyMaterial | QSGNode::DirtyOpacity
-                         | QSGNode::DirtyForceUpdate;
+    const quint32 rebuildBits = QSGNode::DirtyNodeAdded | QSGNode::DirtyNodeRemoved
+                                | QSGNode::DirtyMaterial | QSGNode::DirtyOpacity
+                                | QSGNode::DirtyForceUpdate | QSGNode::DirtyChildrenDoNotOverlap;
 
-    if (flags & rebuildFlags)
+    if (state & rebuildBits)
         m_rebuild_lists = true;
 
-    if (flags & (rebuildFlags | QSGNode::DirtyClipList))
+    if (state & (rebuildBits | QSGNode::DirtyClipList))
         m_needs_sorting = true;
 }