diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-05-30 17:18:16 +0200 |
---|---|---|
committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-06-10 14:05:10 +0200 |
commit | 52644616b3099b47dbe1cac11335721a2b7aacb6 (patch) | |
tree | 7295cb0ba7769fd5e9f7419a94c088972095e00b /src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h | |
parent | 80e9375dfae450ac40088d566e23b9234733b91e (diff) |
Make min-heap member of QMLRenderer instead of stack variable.
The heap is used to sort non-overlapping children.
Diffstat (limited to 'src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h')
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h | 28 |
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 ca1f5592cf..dc2d089391 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 QMLRenderer : 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; |