Merge branch 'master' into qtquick2

Conflicts:
	src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp
	src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
	tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp

Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec

1 files changed, 26 insertions, 2 deletions

diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
index c855ed606a..f2adb00391 100644
--- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -52,6 +52,31 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class IndexGeometryNodePair : public QPair<int, QSGGeometryNode *>
+{
+public:
+    IndexGeometryNodePair(int i, QSGGeometryNode *n);
+    bool operator < (const IndexGeometryNodePair &other) const;
+};
+
+
+// Minimum heap.
+class IndexGeometryNodePairHeap
+{
+public:
+    IndexGeometryNodePairHeap();
+    void insert(const IndexGeometryNodePair &x);
+    const IndexGeometryNodePair &top() const { return v.first(); }
+    IndexGeometryNodePair pop();
+    bool isEmpty() const { return v.isEmpty(); }
+private:
+    static int parent(int i) { return (i - 1) >> 1; }
+    static int left(int i) { return (i << 1) | 1; }
+    static int right(int i) { return (i + 1) << 1; }
+    QDataBuffer<IndexGeometryNodePair> v;
+};
+
+
 class QSGDefaultRenderer : public QSGRenderer
 {
     Q_OBJECT
@@ -77,14 +102,13 @@ private:
     QDataBuffer<QSGGeometryNode *> m_opaqueNodes;
     QDataBuffer<QSGGeometryNode *> m_transparentNodes;
     QDataBuffer<QSGGeometryNode *> m_tempNodes;
+    IndexGeometryNodePairHeap m_heap;
 
     bool m_rebuild_lists;
     bool m_needs_sorting;
     bool m_sort_front_to_back;
     int m_currentRenderOrder;
 
-
-
 #ifdef QML_RUNTIME_TESTING
     bool m_render_opaque_nodes;
     bool m_render_alpha_nodes;