diff options
author | Paolo Angelelli <paolo.angelelli.qt@gmail.com> | 2019-12-26 21:31:03 +0100 |
---|---|---|
committer | paolo <paolo.angelelli.qt@gmail.com> | 2020-02-11 19:35:27 +0100 |
commit | e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe (patch) | |
tree | 17772318d8b51e3eb4bc19dc3d5fee120c137a90 /src/location/labs/qsg/qmapcircleobjectqsg.cpp | |
parent | d055098540df99a5d426360e9322c659e678e5ee (diff) | |
download | qtlocation-e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe.tar.gz |
Fix Map*ObjectsQSG implementation triggering QSGBatchRenderer crashes
The new approach introduces a root node for all objects, that is
repopulated at every repaint.
Change-Id: I4562e1aaa18999a03e8c38fe3bf59fe41f14dd70
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/labs/qsg/qmapcircleobjectqsg.cpp')
-rw-r--r-- | src/location/labs/qsg/qmapcircleobjectqsg.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/location/labs/qsg/qmapcircleobjectqsg.cpp b/src/location/labs/qsg/qmapcircleobjectqsg.cpp index f79be136..6c69ce5a 100644 --- a/src/location/labs/qsg/qmapcircleobjectqsg.cpp +++ b/src/location/labs/qsg/qmapcircleobjectqsg.cpp @@ -154,15 +154,16 @@ QSGNode *QMapCircleObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode, // Q_UNUSED(visibleNode); // coz of -Werror=unused-but-set-parameter MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode); - bool created = false; if (!node) { + if (!m_geometry.size() && !m_borderGeometry.size()) { + return nullptr; + } node = new MapPolygonNode(); *visibleNode = static_cast<VisibleNode *>(node); - created = true; } //TODO: update only material - if (m_geometry.isScreenDirty() || !m_borderGeometry.isScreenDirty() || !oldNode || created) { + if (m_geometry.isScreenDirty() || !m_borderGeometry.isScreenDirty() || !oldNode) { //QMapPolygonObject *p = static_cast<QMapPolygonObject *>(q); node->update(color(), borderColor(), &m_geometry, &m_borderGeometry); m_geometry.setPreserveGeometry(false); @@ -171,9 +172,12 @@ QSGNode *QMapCircleObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode, m_borderGeometry.markClean(); } - if (created) + if (m_geometry.size() || m_borderGeometry.size()) { root->appendChildNode(node); - + } else { + delete node; + return nullptr; + } return node; } |