diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-28 10:57:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-28 14:29:59 +0200 |
| commit | 94db5de2acefb6e96d4f6cfda2df14905a5e63c5 (patch) | |
| tree | c361f5dd4989ee0743e2a9f94b64dbb2127e5dea /src/quick/scenegraph/qsgthreadedrenderloop.cpp | |
| parent | 11f67b80c4eab4b1e3eb8e6b1e8b69e7a60e42a9 (diff) | |
| parent | dee67b41b031791c7b6313e935e622ef8d594686 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 682599c76e..f7e55c7e28 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -56,6 +56,8 @@ #include <private/qquickprofiler_p.h> #include <private/qqmldebugservice_p.h> +#include <private/qquickshadereffectnode_p.h> + /* Overall design: @@ -474,6 +476,8 @@ void QSGRenderThread::invalidateOpenGL(QQuickWindow *window, bool inDestructor, qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- cleanup without an OpenGL context"; } + QQuickShaderEffectMaterial::cleanupMaterialCache(); + // The canvas nodes must be cleaned up regardless if we are in the destructor.. if (wipeSG) { QQuickWindowPrivate *dd = QQuickWindowPrivate::get(window); |