diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-12-19 21:52:05 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-12-23 00:10:50 +0100 |
| commit | 0d342e83123b27befde95fc35760a358dbff0b16 (patch) | |
| tree | 45babc77fffd4cef1e72abdd1aa075b3b2c0f07f /src/quickwidgets/qquickwidget.cpp | |
| parent | 71471cce344768a5e3250fbba3ac5d3c40fb61bc (diff) | |
QQuickWidget: Clean up if RHI goes away under our feet
The QQuickWidget doesn't normally own the RHI; the QWidgetRepaintManager
does, via QBackingStoreRhiSupport. If the top level widget is destroyed,
so is its QBackingStore, and the corresponding RHI. But the QQuickWidget
may outlive its top level parent, in which case it needs to update its
cached reference to the RHI, and do proper cleanup before it goes away.
QRhiWidget already does the same thing, for the same use-case.
This was observed when recreating the top level QWidget via destroy/create
as part of the RHI widget compositor logic.
Fixes: QTBUG-119760
Pick-to: 6.7 6.6 6.5
Change-Id: Ic44449abcfe4271660a3ac4e132d0c4a71a21b65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index fb3c8554be..5b3e4394ce 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -655,6 +655,9 @@ QQuickWidget::~QQuickWidget() delete d->root; d->root = nullptr; + if (d->rhi) + d->rhi->removeCleanupCallback(this); + // NB! resetting graphics resources must be done from this destructor, // *not* from the private class' destructor. This is due to how destruction // works and due to the QWidget dtor (for toplevels) destroying the repaint @@ -1021,8 +1024,19 @@ void QQuickWidgetPrivate::initializeWithRhi() if (rhi) return; - if (QWidgetRepaintManager *repaintManager = tlwd->maybeRepaintManager()) + if (QWidgetRepaintManager *repaintManager = tlwd->maybeRepaintManager()) { rhi = repaintManager->rhi(); + if (rhi) { + // We don't own the RHI, so make sure we clean up if it goes away + rhi->addCleanupCallback(q, [this](QRhi *rhi) { + if (this->rhi == rhi) { + invalidateRenderControl(); + deviceLost = true; + this->rhi = nullptr; + } + }); + } + } if (!rhi) { // The widget (and its parent chain, if any) may not be shown at @@ -1675,6 +1689,8 @@ bool QQuickWidget::event(QEvent *e) } case QEvent::WindowAboutToChangeInternal: + if (d->rhi) + d->rhi->removeCleanupCallback(this); d->invalidateRenderControl(); d->deviceLost = true; d->rhi = nullptr; |