1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: Run cleanup callbacks before the pending deletes

Browse Source 
If a callback deleteLaters a QRhiResource that should still be
handled and not left unreleased. Swap the order.

Change-Id: I8419a28a9db5bb59f768ab5820dfaf593464d6d2
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit d907f1aa92dbd4500a18db2c2492491c34c66087)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2023-07-19 11:19:28 +02:00 committed by Qt Cherry-pick Bot
parent 618abdcd80
commit 4595ad68a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/rhi/qrhi.cpp
View File

@ -7904,11 +7904,11 @@ QRhi::~QRhi()
if (!d) if (!d)
return; return;
runCleanup();
qDeleteAll(d->pendingDeleteResources); qDeleteAll(d->pendingDeleteResources);
d->pendingDeleteResources.clear(); d->pendingDeleteResources.clear();
runCleanup();
d->destroy(); d->destroy();
delete d; delete d;
} }