diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-17 16:06:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 17:40:06 +0100 |
| commit | 44b6bb3560b24ca665140b071a3d11d63ad14c5d (patch) | |
| tree | ae4264c761364e5df02138d6181d674e221ba482 /src/gui/kernel | |
| parent | 1b681bbd0fd4677236a492ebc29146c4ca24c508 (diff) | |
Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resources
Commit 202127f860208c21145e05685bc54219e1655dbd ensured that
QOpenGLMultiGroupSharedResource-owned resources are deleted,
but it was missing a call to invalidateResource().
Change-Id: I166ce8a7298772408081331fe1a91bd2cd88aebb
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qopenglcontext_p.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 88925df606..3549f647b5 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -595,6 +595,7 @@ void QOpenGLMultiGroupSharedResource::cleanup(QOpenGLContextGroup *group, QOpenG #ifdef QT_GL_CONTEXT_RESOURCE_DEBUG qDebug("Cleaning up context group resource %p, for group %p in thread %p.", this, group, QThread::currentThread()); #endif + value->invalidateResource(); value->free(); active.deref(); diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index 1a47d293e5..aff1042c5b 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -80,6 +80,7 @@ private: friend class QOpenGLContextGroup; friend class QOpenGLContextGroupPrivate; + friend class QOpenGLMultiGroupSharedResource; Q_DISABLE_COPY(QOpenGLSharedResource); }; |