1 files changed, 93 insertions, 10 deletions

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index b10d5da..2b74e69 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -20,10 +21,9 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -196,7 +196,9 @@ public:
     bool autoSwap;
 
     QGLColormap cmap;
+#ifndef QT_OPENGL_ES
     QMap<QString, int> displayListCache;
+#endif
 
     bool disable_clear_on_painter_begin;
 
@@ -237,13 +239,37 @@ private:
     friend class QGLContextPrivate;
 };
 
+// Reference to a QGLContext which automatically switches to another
+// shared context when the main one is destroyed.  If there is no
+// shared context to switch to, the context pointer is set to null.
+// Note: should be merged into QGLContextGroup at some point.
+class QGLContextReference : public QObject
+{
+    Q_OBJECT
+public:
+    QGLContextReference(const QGLContext *ctx);
+    ~QGLContextReference() {}
+
+    const QGLContext *context() const { return m_ctx; }
+
+    void ref() { m_ref.ref(); }
+    bool deref() { return m_ref.deref(); }
+
+private slots:
+    void aboutToDestroyContext(const QGLContext *ctx);
+
+private:
+    QAtomicInt m_ref;
+    const QGLContext *m_ctx;
+};
+
 class QGLTexture;
 
 class QGLContextPrivate
 {
     Q_DECLARE_PUBLIC(QGLContext)
 public:
-    explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {group = new QGLContextGroup(context);}
+    explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {reference = new QGLContextReference(context); group = new QGLContextGroup(context);}
     ~QGLContextPrivate();
     QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format,
                             QGLContext::BindOptions options);
@@ -305,6 +331,7 @@ public:
     QGLContext *q_ptr;
     QGLFormat::OpenGLVersionFlags version_flags;
 
+    QGLContextReference *reference;
     QGLContextGroup *group;
     GLint max_texture_size;
 
@@ -324,6 +351,8 @@ public:
     static inline QGLExtensionFuncs& extensionFuncs(QGLContextGroup *) { return qt_extensionFuncs; }
 #endif
 
+    static void setCurrentContext(QGLContext *context);
+
     QPixmapFilter *createPixmapFilter(int type) const;
 };
 
@@ -371,11 +400,6 @@ public:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions)
 
 
-struct QGLThreadContext {
-    QGLContext *context;
-};
-extern QThreadStorage<QGLThreadContext *> qgl_context_storage;
-
 class QGLShareRegister
 {
 public:
@@ -554,6 +578,65 @@ private:
     QGLContext *m_ctx;
 };
 
+// Put a guard around a GL object identifier and its context.
+// When the context goes away, a shared context will be used
+// in its place.  If there are no more shared contexts, then
+// the identifier is returned as zero - it is assumed that the
+// context destruction cleaned up the identifier in this case.
+class Q_OPENGL_EXPORT QGLSharedResourceGuard
+{
+public:
+    QGLSharedResourceGuard(const QGLContext *context)
+        : m_ctxref(0), m_id(0)
+    {
+        setContext(context);
+    }
+    QGLSharedResourceGuard(const QGLContext *context, GLuint id)
+        : m_ctxref(0), m_id(id)
+    {
+        setContext(context);
+    }
+    ~QGLSharedResourceGuard()
+    {
+        if (m_ctxref && !m_ctxref->deref())
+            delete m_ctxref;
+    }
+
+    const QGLContext *context() const
+    {
+        return m_ctxref ? m_ctxref->context() : 0;
+    }
+
+    void setContext(const QGLContext *context)
+    {
+        if (m_ctxref && !m_ctxref->deref())
+            delete m_ctxref;
+        if (context) {
+            m_ctxref = context->d_ptr->reference;
+            m_ctxref->ref();
+        } else {
+            m_ctxref = 0;
+        }
+    }
+
+    GLuint id() const
+    {
+        if (m_ctxref && m_ctxref->context())
+            return m_id;
+        else
+            return 0;
+    }
+
+    void setId(GLuint id)
+    {
+        m_id = id;
+    }
+
+private:
+    QGLContextReference *m_ctxref;
+    GLuint m_id;
+};
+
 QT_END_NAMESPACE
 
 #endif // QGL_P_H