Free ShaderEffectSource FBOs when no longer needed.

This commit also fixes handling of texture provider deletion in
ShaderEffect.

Change-Id: Ib22a9308a35325972bc545cf29de11bd625b22b2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index ae61ad940d..c4b91844e0 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -376,6 +376,14 @@ void QQuickShaderEffectMaterial::updateTextures() const
     }
 }
 
+void QQuickShaderEffectMaterial::invalidateTextureProvider(QSGTextureProvider *provider)
+{
+    for (int i = 0; i < m_textures.size(); ++i) {
+        if (provider == m_textures.at(i).second)
+            m_textures[i].second = 0;
+    }
+}
+
 
 QQuickShaderEffectNode::QQuickShaderEffectNode()
     : m_material(this)
@@ -397,6 +405,12 @@ void QQuickShaderEffectNode::markDirtyTexture()
     markDirty(DirtyMaterial);
 }
 
+void QQuickShaderEffectNode::textureProviderDestroyed(QObject *object)
+{
+    Q_ASSERT(qobject_cast<QSGTextureProvider *>(object));
+    m_material.invalidateTextureProvider(static_cast<QSGTextureProvider *>(object));
+}
+
 void QQuickShaderEffectNode::preprocess()
 {
     Q_ASSERT(material());