Used QGLContextResource for the gradient cache in the GL2 paint engine.

Reviewed-by: Tom

3 files changed, 31 insertions, 30 deletions

diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp
index 8c6b4f0..7c54bb9 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache.cpp
+++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp
@@ -46,6 +46,28 @@
 
 QT_BEGIN_NAMESPACE
 
+static void QGL2GradientCache_free(void *ptr)
+{
+    delete reinterpret_cast<QGL2GradientCache *>(ptr);
+}
+
+Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_gradient_caches, (QGL2GradientCache_free))
+
+QGL2GradientCache *QGL2GradientCache::cacheForContext(const QGLContext *context)
+{
+    QGL2GradientCache *p = reinterpret_cast<QGL2GradientCache *>(qt_gradient_caches()->value(context));
+    if (!p) {
+        QGLContext *oldContext = const_cast<QGLContext *>(QGLContext::currentContext());
+        if (oldContext != context)
+            const_cast<QGLContext *>(context)->makeCurrent();
+        p = new QGL2GradientCache;
+        qt_gradient_caches()->insert(context, p);
+        if (oldContext && oldContext != context)
+            oldContext->makeCurrent();
+    }
+    return p;
+}
+
 void QGL2GradientCache::cleanCache() {
     QGLGradientColorTableHash::const_iterator it = cache.constBegin();
     for (; it != cache.constEnd(); ++it) {
@@ -55,13 +77,8 @@ void QGL2GradientCache::cleanCache() {
     cache.clear();
 }
 
-GLuint QGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity, const QGLContext *ctx)
+GLuint QGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity)
 {
-    if (buffer_ctx && !qgl_share_reg()->checkSharing(buffer_ctx, ctx))
-        cleanCache();
-
-    buffer_ctx = ctx;
-
     quint64 hash_val = 0;
 
     QGradientStops stops = gradient.stops();
diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h
index 55c7b65..ba698bc 100644
--- a/src/opengl/gl2paintengineex/qglgradientcache_p.h
+++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h
@@ -53,12 +53,12 @@
 #include <QMultiHash>
 #include <QObject>
 #include <QtOpenGL/QtOpenGL>
+#include <private/qgl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QGL2GradientCache : public QObject
+class QGL2GradientCache
 {
-    Q_OBJECT
     struct CacheInfo
     {
         inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
@@ -73,16 +73,12 @@ class QGL2GradientCache : public QObject
     typedef QMultiHash<quint64, CacheInfo> QGLGradientColorTableHash;
 
 public:
-    QGL2GradientCache() : QObject(), buffer_ctx(0)
-    {
-/*
-        connect(QGLSignalProxy::instance(),
-                SIGNAL(aboutToDestroyContext(const QGLContext *)),
-                SLOT(cleanupGLContextRefs(const QGLContext *)));
-*/
-    }
+    static QGL2GradientCache *cacheForContext(const QGLContext *context);
+
+    QGL2GradientCache() { }
+    ~QGL2GradientCache() {cleanCache();}
 
-    GLuint getBuffer(const QGradient &gradient, qreal opacity, const QGLContext *ctx);
+    GLuint getBuffer(const QGradient &gradient, qreal opacity);
     inline int paletteSize() const { return 1024; }
 
 protected:
@@ -95,15 +91,6 @@ protected:
     void cleanCache();
 
     QGLGradientColorTableHash cache;
-    const QGLContext *buffer_ctx;
-
-public slots:
-    void cleanupGLContextRefs(const QGLContext *context) {
-        if (context == buffer_ctx) {
-            cleanCache();
-            buffer_ctx = 0;
-        }
-    }
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 9b0321d..939cd0d 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -334,9 +334,6 @@ void QGL2PaintEngineExPrivate::useSimpleShader()
     }
 }
 
-
-Q_GLOBAL_STATIC(QGL2GradientCache, qt_opengl_gradient_cache)
-
 void QGL2PaintEngineExPrivate::updateBrushTexture()
 {
 //     qDebug("QGL2PaintEngineExPrivate::updateBrushTexture()");
@@ -357,7 +354,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture()
 
         // We apply global opacity in the fragment shaders, so we always pass 1.0
         // for opacity to the cache.
-        GLuint texId = qt_opengl_gradient_cache()->getBuffer(*g, 1.0, ctx);
+        GLuint texId = QGL2GradientCache::cacheForContext(ctx)->getBuffer(*g, 1.0);
 
         if (g->spread() == QGradient::RepeatSpread || g->type() == QGradient::ConicalGradient)
             updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, true);