Move GL resource handling enablers to QtGui.

Made resource handling more robust by attempting to free GL resources in
the correct thread, and not forcing a context to become current to free
resources.

Change-Id: Ie81d4005b608972375755571d9b50ce82080709b
Reviewed-on: http://codereview.qt.nokia.com/3258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 23 insertions, 2 deletions

diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp
index 9e6b801c40..bd408ffdc4 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache.cpp
+++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp
@@ -51,21 +51,42 @@ class QGL2GradientCacheWrapper
 public:
     QGL2GradientCache *cacheForContext(const QGLContext *context) {
         QMutexLocker lock(&m_mutex);
-        return m_resource.value(context);
+        return m_resource.value<QGL2GradientCache>(context->contextHandle());
     }
 
 private:
-    QGLContextGroupResource<QGL2GradientCache> m_resource;
+    QGLMultiGroupSharedResource m_resource;
     QMutex m_mutex;
 };
 
 Q_GLOBAL_STATIC(QGL2GradientCacheWrapper, qt_gradient_caches)
 
+QGL2GradientCache::QGL2GradientCache(QGuiGLContext *ctx)
+    : QGLSharedResource(ctx->shareGroup())
+{
+}
+
+QGL2GradientCache::~QGL2GradientCache()
+{
+    cache.clear();
+}
+
 QGL2GradientCache *QGL2GradientCache::cacheForContext(const QGLContext *context)
 {
     return qt_gradient_caches()->cacheForContext(context);
 }
 
+void QGL2GradientCache::invalidateResource()
+{
+    QMutexLocker lock(&m_mutex);
+    cache.clear();
+}
+
+void QGL2GradientCache::freeResource(QGuiGLContext *)
+{
+    cleanCache();
+}
+
 void QGL2GradientCache::cleanCache()
 {
     QMutexLocker lock(&m_mutex);