From 1ff94e314835682b178eac98c3c1be983e71c4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 16 Aug 2011 09:28:01 +0200
Subject: Get rid of unused convenience class in QtOpenGL.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QGLContextResource is no longer used, QGLContextGroupResource should be
preferable in all situations.

Change-Id: I7c7b90686959ced9fa34e278ef5747a7c49a5b03
Reviewed-on: http://codereview.qt.nokia.com/3005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 src/opengl/qgl_p.h | 64 ------------------------------------------------------
 1 file changed, 64 deletions(-)

(limited to 'src/opengl/qgl_p.h')

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index f2590e82b1..f418008203 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -433,7 +433,6 @@ public:
     GLuint current_fbo;
     GLuint default_fbo;
     QPaintEngine *active_engine;
-    QHash<QGLContextResourceBase *, void *> m_resources;
     QGLTextureDestroyer *texture_destroyer;
 
     QGLFunctions *functions;
@@ -739,69 +738,6 @@ protected:
     }
 };
 
-/*
-   Base for resources that are context specific.
-*/
-class Q_OPENGL_EXPORT QGLContextResourceBase
-{
-public:
-    virtual ~QGLContextResourceBase() {
-        for (int i = 0; i < m_contexts.size(); ++i)
-            m_contexts.at(i)->d_ptr->m_resources.remove(this);
-    }
-
-    void insert(const QGLContext *context, void *value) {
-        context->d_ptr->m_resources.insert(this, value);
-    }
-
-    void *value(const QGLContext *context) {
-        return context->d_ptr->m_resources.value(this, 0);
-    }
-    virtual void freeResource(void *value) = 0;
-
-protected:
-    QList<const QGLContext *> m_contexts;
-};
-
-/*
-   The QGLContextResource template is used to manage a resource for a
-   single GL context. Just before the context is destroyed (while it's
-   still the current context), or when the QGLContextResource object
-   itself is destroyed (implies potential context switches), the
-   resource will be freed.  The class used as the template class type
-   needs to have a constructor with the following signature: T(const
-   QGLContext *);
-*/
-template <class T>
-class QGLContextResource : public QGLContextResourceBase
-{
-public:
-    ~QGLContextResource() {
-        for (int i = 0; i < m_contexts.size(); ++i) {
-            const QGLContext *context = m_contexts.at(i);
-            T *resource = reinterpret_cast<T *>(QGLContextResourceBase::value(context));
-            if (resource) {
-                QGLShareContextScope scope(context);
-                delete resource;
-            }
-        }
-    }
-
-    T *value(const QGLContext *context) {
-        T *resource = reinterpret_cast<T *>(QGLContextResourceBase::value(context));
-        if (!resource) {
-            resource = new T(context);
-            insert(context, resource);
-        }
-        return resource;
-    }
-
-protected:
-    void freeResource(void *resource) {
-        delete reinterpret_cast<T *>(resource);
-    }
-};
-
 // 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
-- 
cgit v1.2.3