diff options
| author | Robin Burchell <robin.burchell@crimson.no> | 2017-03-13 16:33:18 +0100 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@crimson.no> | 2017-03-15 14:23:25 +0000 |
| commit | 212ccd59627deb8c06227dbf0f3f3329006c326e (patch) | |
| tree | fec9b644ba056f542359c87b79dc72a3a91f6606 /src/quick/scenegraph/qsgdistancefieldglyphnode_p.h | |
| parent | 12e82111ab86669969430ab10118236d8d846d33 (diff) | |
QSGDistanceFieldGlyphNode: Remove per-node QLinkedList of nodes to delete
We avoided deleting these nodes directly due to preprocess, but this is
a bit of a hack. QSGRenderer::preprocess already contains some work to
allow for modification of nodes at preprocess time, but it didn't allow
for detecting dead nodes.
By marking a pointer as not to be touched if it is removed during preprocess,
we can remove the per-node QLinkedList and delete directly, while at the same
time, still not touching deleted nodes later on in preprocess.
Change-Id: I99a1ea65d3fe0b73db73e4a1d10d999d56edcdc4
Reviewed-by: Gunnar Sletta <gunnar@crimson.no>
Diffstat (limited to 'src/quick/scenegraph/qsgdistancefieldglyphnode_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgdistancefieldglyphnode_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h index c0c6bda718..04446c7b2c 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h @@ -107,7 +107,6 @@ private: AntialiasingMode m_antialiasingMode; QRectF m_boundingRect; const QSGDistanceFieldGlyphCache::Texture *m_texture; - QLinkedList<QSGNode *> m_nodesToDelete; struct GlyphInfo { QVector<quint32> indexes; |