From 6dc44dd1276d0667d92348baf5c20bba5ffe3c1e Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 17 Apr 2023 13:46:10 +0200 Subject: [PATCH] QOpenGLWidget: correct the lifetime of the wrapper texture objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the QOpenGLFramebufferObject (which owns the OpenGL texture object) is destroyed, the wrapper QRhiTexture must be destroyed too. This surfaced with WebAssembly for some reason, likely due to an event (most likely resize) sending pattern that is different from other platforms. Sending more resizes likely triggers another recreateFbos() call which, until now, did not correctly dropped the wrapper QRhiTextures so those continued to refer to the now-destroyed texture IDs. Task-number: QTBUG-111304 Change-Id: Ieed9a11c5c28da0fee497107ebe88da9eb5f45a8 Reviewed-by: Morten Johan Sørvig (cherry picked from commit 2b908ba8f40924abded15681cf3b4af6056c3050) Reviewed-by: Qt Cherry-pick Bot --- src/openglwidgets/qopenglwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openglwidgets/qopenglwidget.cpp b/src/openglwidgets/qopenglwidget.cpp index bb41b91fbf6..1723b87c568 100644 --- a/src/openglwidgets/qopenglwidget.cpp +++ b/src/openglwidgets/qopenglwidget.cpp @@ -691,8 +691,6 @@ void QOpenGLWidgetPrivate::reset() destroyFbos(); - resetRhiDependentResources(); - if (initialized) q->doneCurrent(); @@ -1016,6 +1014,8 @@ void QOpenGLWidgetPrivate::destroyFbos() fbos[QOpenGLWidget::RightBuffer] = nullptr; delete resolvedFbos[QOpenGLWidget::RightBuffer]; resolvedFbos[QOpenGLWidget::RightBuffer] = nullptr; + + resetRhiDependentResources(); } QImage QOpenGLWidgetPrivate::grabFramebuffer()