Task: Resource handling needs refactoring.

Phase One: 1. fixed lots of memory leaks related to Texture2D's not being deleted. 2. Texture2D now prints warning in destructor, if cleanupResources() was not properly called before. Task-number: QTBUG-24043 Change-Id: Ia6a8bbe38ad66778a38705e0a4464f24373d8846 Reviewed-by: Danny Pope <[email protected]>
dignakov · Feb 12, 2012 · 2c29c50 · 2c29c50
1 parent ce825d2
commit 2c29c50
Show file tree

Hide file tree

Showing 27 changed files with 70 additions and 63 deletions.
diff --git a/demos/qt3d/cubehouse/cubeview.cpp b/demos/qt3d/cubehouse/cubeview.cpp
@@ -139,7 +139,7 @@ void CubeView::initializeGL(QGLPainter *painter)
     builder.popNode();
 
     int index;
-    QGLMaterialCollection *palette = builder.sceneNode()->palette();
+    QSharedPointer<QGLMaterialCollection> palette = builder.sceneNode()->palette();
 
     QGLMaterial *mat1 = new QGLMaterial();
     mat1->setDiffuseColor(QColor(128, 100, 0));

diff --git a/demos/qt3d/photobrowser3d/buttons.cpp b/demos/qt3d/photobrowser3d/buttons.cpp
@@ -42,7 +42,7 @@
 #include "buttons.h"
 #include "qglpainter.h"
 
-Buttons::Buttons(QObject *parent, QGLMaterialCollection *palette)
+Buttons::Buttons(QObject *parent, QSharedPointer<QGLMaterialCollection> palette)
     : QGLSceneNode(parent)
 {
     setObjectName("Buttons");

diff --git a/demos/qt3d/photobrowser3d/buttons.h b/demos/qt3d/photobrowser3d/buttons.h
@@ -50,7 +50,7 @@ class Buttons : public QGLSceneNode
 {
     Q_OBJECT
 public:
-    explicit Buttons(QObject *parent, QGLMaterialCollection *palette);
+    explicit Buttons(QObject *parent, QSharedPointer<QGLMaterialCollection> palette);
     void draw(QGLPainter *painter);
     void clearPositions();
 private:

diff --git a/demos/qt3d/photobrowser3d/imagedisplay.cpp b/demos/qt3d/photobrowser3d/imagedisplay.cpp
@@ -91,7 +91,7 @@ static inline void qAddPane(QSizeF size, QGeometryData *data)
     data->appendIndices(k, k+2, k+3);
 }
 
-ImageDisplay::ImageDisplay(QObject *parent, QGLMaterialCollection *materials, qreal wallSize)
+ImageDisplay::ImageDisplay(QObject *parent, QSharedPointer<QGLMaterialCollection> materials, qreal wallSize)
     : QGLSceneNode(parent)
     , m_wall(0)
     , m_frames(0)

diff --git a/demos/qt3d/photobrowser3d/imagedisplay.h b/demos/qt3d/photobrowser3d/imagedisplay.h
@@ -60,7 +60,7 @@ class ImageDisplay : public QGLSceneNode
 {
     Q_OBJECT
 public:
-    ImageDisplay(QObject *parent, QGLMaterialCollection *materials, qreal wallSize = 4.0);
+    ImageDisplay(QObject *parent, QSharedPointer<QGLMaterialCollection> materials, qreal wallSize = 4.0);
     ~ImageDisplay();
     int maxImages() const { return m_maxImages; }
     void setMaxImages(int max) { m_maxImages = max; }

diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
@@ -71,7 +71,7 @@ PhotoBrowser3DView::PhotoBrowser3DView()
     , m_images(0)
     , m_buttons(0)
     , m_skybox(0)
-    , m_palette(new QGLMaterialCollection(this))
+    , m_palette(new QGLMaterialCollection())
     , m_state(0)
     , m_app(0)
     , m_zoomed(0)

diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.h b/demos/qt3d/photobrowser3d/photobrowser3dview.h
@@ -98,7 +98,7 @@ private slots:
     ImageManager *m_images;
     Buttons *m_buttons;
     SkyBox *m_skybox;
-    QGLMaterialCollection *m_palette;
+    QSharedPointer<QGLMaterialCollection> m_palette;
     QStateMachine *m_state;
     QState *m_app;
     QState *m_zoomed;

diff --git a/demos/qt3d/photobrowser3d/qatlas.cpp b/demos/qt3d/photobrowser3d/qatlas.cpp
@@ -86,6 +86,7 @@ void QAtlas::initialize(QGLPainter *painter)
         m_data = new QOpenGLFramebufferObject(m_size);
         m_renderTarget = new QGLFramebufferObjectSurface(m_data);
         m_tex = QGLTexture2D::fromTextureId(m_data->texture(), m_size);
+        m_tex->setParent(m_material);
         m_material->setTexture(m_tex, 1);
         m_material->setObjectName("Atlas material");
         m_initialized = true;

diff --git a/demos/qt3d/photobrowser3d/skybox.cpp b/demos/qt3d/photobrowser3d/skybox.cpp
@@ -49,7 +49,8 @@
 #include <QFileInfo>
 
 SkyBox::SkyBox(QGLView *view, const QString &imagePath)
-    : m_scene(0)
+    : QObject(view)
+    , m_scene(0)
     , m_view(view)
     , m_camera(new QGLCamera(this))
 {

diff --git a/demos/qt3d/photobrowser3d/thumbnailnode.cpp b/demos/qt3d/photobrowser3d/thumbnailnode.cpp
@@ -60,7 +60,7 @@ ThumbnailNode::ThumbnailNode(QObject *parent)
     , m_manager(0)
     , m_lastDistance(ThumbnailNode::Unknown)
 {
-    setPalette(new QGLMaterialCollection(this));
+    setPalette(QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection(this)));
 }
 
 ThumbnailNode::~ThumbnailNode()
@@ -139,13 +139,12 @@ void ThumbnailNode::loadFullImage()
             m_full->materialIndex() == m_defaultMaterial)
     {
         QGLMaterial *mat = new QGLMaterial;
-        QGLTexture2D *tex = new QGLTexture2D;
+        QGLTexture2D *tex = new QGLTexture2D(mat);
         tex->setImage(m_image.data());
         mat->setTexture(tex);
         mat->setObjectName(m_image.url().path());
         int ix = palette()->addMaterial(mat);
         m_full->setMaterialIndex(ix);
-        mat->setParent(m_full);
     }
 }
 

diff --git a/examples/qt3d/geometry/geometry.cpp b/examples/qt3d/geometry/geometry.cpp
@@ -50,7 +50,7 @@
 // http://en.wikipedia.org/wiki/Icosahedron#Cartesian_coordinates
 const float phi = 1.618033988749894848f;
 
-Geometry::Geometry(QObject *parent, QGLMaterialCollection *materials)
+Geometry::Geometry(QObject *parent, QSharedPointer<QGLMaterialCollection> materials)
     : QGLSceneNode(parent)
 {
     setPalette(materials);

diff --git a/examples/qt3d/geometry/geometry.h b/examples/qt3d/geometry/geometry.h
@@ -52,7 +52,7 @@ QT_END_NAMESPACE
 class Geometry : public QGLSceneNode
 {
 public:
-    Geometry(QObject *parent = 0, QGLMaterialCollection *materials = 0);
+    Geometry(QObject *parent, QSharedPointer<QGLMaterialCollection> materials);
 };
 
 #endif // GEOMETRY_H
diff --git a/examples/qt3d/geometry/geometryview.cpp b/examples/qt3d/geometry/geometryview.cpp
@@ -65,7 +65,7 @@ GeometryView::GeometryView(QWindow *parent)
     lp->setSpotExponent(24);
     lp->setSpotDirection(QVector3D(0.0, -1.0, -2.0));
 
-    palette = new QGLMaterialCollection(this);
+    QSharedPointer<QGLMaterialCollection> palette(new QGLMaterialCollection());
 
     // first set up the geometry - an icosahedron
     // this one handles all its own colors and textures

diff --git a/examples/qt3d/tank/tankview.cpp b/examples/qt3d/tank/tankview.cpp
@@ -54,7 +54,7 @@ TankView::TankView(QWindow *parent)
     , m_count(0)
 {
     m_tankScene->setParent(this);
-    m_tankScene->setPalette(new QGLMaterialCollection(this));
+    m_tankScene->setPalette(QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection(this)));
     m_tankScene->setEffect(QGL::LitDecalTexture2D);
     m_tankScene->addNode(new QuadPlane(0, QSizeF(25, 25)));
     Tank *tank = addTank();

diff --git a/src/plugins/sceneformats/assimp/qailoader.cpp b/src/plugins/sceneformats/assimp/qailoader.cpp
@@ -481,7 +481,6 @@ void QAiLoader::loadTextures(aiMaterial *ma, QGLMaterial *mq)
 */
 void QAiLoader::loadMaterial(aiMaterial *ma)
 {
-    QGLMaterialCollection *palette = m_builder.palette();
     QGLMaterial *mq = new QGLMaterial;
     mq->setObjectName("___DEFAULT_NAME___");
 
@@ -548,7 +547,7 @@ void QAiLoader::loadMaterial(aiMaterial *ma)
     //
     // executive summary: don't muck around with the palettte outside of this call
 
-    int k = palette->addMaterial(mq);
+    int k = m_builder.palette()->addMaterial(mq);
 
     Q_UNUSED(k);
     //qDebug() << "loaded material" << k << mq;

diff --git a/src/plugins/sceneformats/assimp/qaiscene.cpp b/src/plugins/sceneformats/assimp/qaiscene.cpp
@@ -69,6 +69,7 @@ QAiScene::QAiScene(const aiScene *scene, QAiSceneHandler *handler)
     Q_ASSERT(scene);
     QAiLoader loader(scene, handler);
     m_root = loader.loadMeshes();
+    m_root->setParent(this);
     m_animations = loader.loadAnimations();
 }
 

diff --git a/src/plugins/sceneformats/assimp/qaiscenehandler.cpp b/src/plugins/sceneformats/assimp/qaiscenehandler.cpp
@@ -215,9 +215,6 @@ void QAiSceneHandler::decodeOptions(const QString &options)
 
 QGLAbstractScene *QAiSceneHandler::read()
 {
-    qDebug() << "QAiSceneHandler::read()";
-
-
     AiLoaderIOSystem *ios = new AiLoaderIOSystem(device(), url());
     m_importer.SetIOHandler(ios);
 

diff --git a/src/quick3d/qdeclarativeeffect.cpp b/src/quick3d/qdeclarativeeffect.cpp
@@ -97,24 +97,24 @@ class QDeclarativeEffectPrivate
 
     ~QDeclarativeEffectPrivate()
     {
-        delete palette;
+        palette.clear();
     }
 
     QColor color;
     bool useLighting;
     bool decal;
     bool blending;
-    QGLMaterialCollection *palette;
+    QSharedPointer<QGLMaterialCollection> palette;
     int materialIndex;
     qreal progress;
     inline void ensureMaterial() {
         if (!palette)
         {
-            palette = new QGLMaterialCollection();
+            palette = QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection());
         }
         if (materialIndex == -1)
         {
-            materialIndex = palette->addMaterial(new QGLMaterial(palette));
+            materialIndex = palette->addMaterial(new QGLMaterial(palette.data()));
             palette->material(materialIndex)->setColor(color);
         }
         // TODO: decal & blending

diff --git a/src/quick3d/qdeclarativemesh.cpp b/src/quick3d/qdeclarativemesh.cpp
@@ -144,9 +144,8 @@ class QDeclarativeMeshPrivate
 */
 QDeclarativeMesh::QDeclarativeMesh(QObject *parent)
     : QObject(parent)
-{
-    d = new QDeclarativeMeshPrivate();
-}
+    ,d(new QDeclarativeMeshPrivate())
+{}
 
 /*!
     \internal
@@ -324,7 +323,7 @@ void QDeclarativeMesh::initSceneObjectList()
 */
 void QDeclarativeMesh::initAnimations()
 {
-    qDebug("QDeclarativeMesh::initAnimations()");
+    //qDebug("QDeclarativeMesh::initAnimations()");
     d->originalAnimations.clear();
     if (d->scene) {
         const QList<QGLSceneAnimation *>& rSrcList = d->scene->animations();
@@ -506,7 +505,7 @@ int QDeclarativeMesh::nextSceneBranchId() const
     destruction rules apply, however this \a parent parameter gives the user extra flexibility if
     required.
 */
-int QDeclarativeMesh::createSceneBranch(QString nodeName, QObject *parent)
+int QDeclarativeMesh::createSceneBranch(QString nodeName)
 {
     if (!d->scene) {
         qWarning() << "Unable to split mesh: no scene initialised - attempt to add scene object failed.";
@@ -525,9 +524,7 @@ int QDeclarativeMesh::createSceneBranch(QString nodeName, QObject *parent)
             if (parentNode)
                 parentNode->removeNode(sceneNode);  //this becomes irrelevant.
 
-            //sceneNode->setParent(d->scene);     //TODO: currently this fails as sceneNode changes make problems.
-            //If no specific parent is nominated, use the scene specified by the mesh
-            parent ? sceneNode->setParent(parent)  : sceneNode->setParent(d->scene);
+            sceneNode->setParent(d->scene);
             addSceneBranch(sceneNode, prevParent);
 
             return branchId;
@@ -688,7 +685,7 @@ QObject *QDeclarativeMesh::material(const QString& nodeName, const QString& mate
 
     QGLSceneNode *node = qobject_cast<QGLSceneNode *>(sceneObject);
 
-    QGLMaterialCollection *p = node->palette();
+    QGLMaterialCollection *p = node->palette().data();
 
     QGLMaterial *params =  p->material(materialName);
     if (params && !d->connected.contains(params)) {

diff --git a/src/quick3d/qdeclarativemesh.h b/src/quick3d/qdeclarativemesh.h
@@ -104,7 +104,7 @@ class Q_QT3D_QUICK_EXPORT QDeclarativeMesh : public QObject, public QDeclarative
 
     //The following functions relate to splitting the main scene into sub-branches
     int nextSceneBranchId() const;
-    int createSceneBranch(QString nodeName, QObject *parent = 0);
+    int createSceneBranch(QString nodeName);
     int addSceneBranch(QGLSceneNode *rootSceneObject, QObject *previousParent=NULL);
     void restoreSceneBranch(int branchId);
     void resetSceneBranches();

diff --git a/src/threed/geometry/qglbuilder.cpp b/src/threed/geometry/qglbuilder.cpp
@@ -441,7 +441,16 @@ QGLBuilder::QGLBuilder(QGLMaterialCollection *materials)
 {
     dptr->rootNode = new QGLSceneNode;
     if (!materials)
-        materials = new QGLMaterialCollection(dptr->rootNode);
+        materials = new QGLMaterialCollection();
+    dptr->rootNode->setPalette(QSharedPointer<QGLMaterialCollection>(materials));
+}
+
+QGLBuilder::QGLBuilder(QSharedPointer<QGLMaterialCollection> materials)
+    : dptr(new QGLBuilderPrivate(this))
+{
+    dptr->rootNode = new QGLSceneNode;
+    if (materials.isNull())
+        materials = QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection());
     dptr->rootNode->setPalette(materials);
 }
 
@@ -1344,7 +1353,7 @@ QGLSceneNode *QGLBuilder::popNode()
 
     \sa sceneNode()
 */
-QGLMaterialCollection *QGLBuilder::palette()
+QSharedPointer<QGLMaterialCollection> QGLBuilder::palette()
 {
     return dptr->rootNode->palette();
 }

diff --git a/src/threed/geometry/qglbuilder.h b/src/threed/geometry/qglbuilder.h
@@ -66,6 +66,7 @@ class Q_QT3D_EXPORT QGLBuilder
 {
 public:
     explicit QGLBuilder(QGLMaterialCollection *materials = 0);
+    explicit QGLBuilder(QSharedPointer<QGLMaterialCollection> materials);
     virtual ~QGLBuilder();
 
     // section management
@@ -77,7 +78,7 @@ class Q_QT3D_EXPORT QGLBuilder
     QGLSceneNode *newNode();
     QGLSceneNode *pushNode();
     QGLSceneNode *popNode();
-    QGLMaterialCollection *palette();
+    QSharedPointer<QGLMaterialCollection> palette();
     QGLSceneNode *finalizedSceneNode();
 
     // geometry building by primitive

diff --git a/src/threed/scene/qglscenenode.cpp b/src/threed/scene/qglscenenode.cpp
@@ -954,7 +954,7 @@ void QGLSceneNode::setMaterial(QGLMaterial *material)
 {
     Q_D(QGLSceneNode);
     if (!d->palette)
-        d->palette = new QGLMaterialCollection(this);
+        d->palette = QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection(this));
     int ix = d->palette->indexOf(material);
     if (ix == -1)
         ix = d->palette->addMaterial(material);
@@ -997,7 +997,7 @@ void QGLSceneNode::setBackMaterial(QGLMaterial *material)
 {
     Q_D(QGLSceneNode);
     if (!d->palette)
-        d->palette = new QGLMaterialCollection(this);
+        d->palette = QSharedPointer<QGLMaterialCollection>(new QGLMaterialCollection(this));
     int ix = d->palette->indexOf(material);
     if (ix == -1)
         ix = d->palette->addMaterial(material);
@@ -1009,7 +1009,7 @@ void QGLSceneNode::setBackMaterial(QGLMaterial *material)
 
     \sa setPalette()
 */
-QGLMaterialCollection *QGLSceneNode::palette() const
+QSharedPointer<QGLMaterialCollection> QGLSceneNode::palette() const
 {
     Q_D(const QGLSceneNode);
     return d->palette;
@@ -1020,10 +1020,10 @@ QGLMaterialCollection *QGLSceneNode::palette() const
 
     \sa palette()
 */
-void QGLSceneNode::setPalette(QGLMaterialCollection *palette)
+void QGLSceneNode::setPalette(QSharedPointer<QGLMaterialCollection> palette)
 {
     Q_D(QGLSceneNode);
-    if (d->palette != palette) {
+    if (d->palette.data() != palette.data()) {
         d->palette = palette;
         emit updated();
     }
@@ -2056,7 +2056,7 @@ void qDumpScene(QGLSceneNode *node, bool detailed, int indent, const QSet<QGLSce
     {
         qDebug("%s material: %d", qPrintable(ind), node->materialIndex());
         QGLMaterial *mat = node->material();
-        QGLMaterialCollection *pal = node->palette();
+        QGLMaterialCollection *pal = node->palette().data();
         if (pal)
             qDebug("%s palette: %p", qPrintable(ind), pal);
         else

diff --git a/src/threed/scene/qglscenenode.h b/src/threed/scene/qglscenenode.h
@@ -141,8 +141,8 @@ class Q_QT3D_EXPORT QGLSceneNode : public QObject
     QGLMaterial *backMaterial() const;
     void setBackMaterial(QGLMaterial *material);
 
-    QGLMaterialCollection *palette() const;
-    void setPalette(QGLMaterialCollection *palette);
+    QSharedPointer<QGLMaterialCollection> palette() const;
+    void setPalette(QSharedPointer<QGLMaterialCollection> palette);
 
     QList<QGLSceneNode*> allChildren() const;
     QList<QGLSceneNode *> children() const;

diff --git a/src/threed/scene/qglscenenode_p.h b/src/threed/scene/qglscenenode_p.h
@@ -62,6 +62,8 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qset.h>
 
+#include <QSharedPointer>
+
 QT_BEGIN_NAMESPACE
 
 class QGLAbstractEffect;
@@ -118,7 +120,7 @@ class QGLSceneNodePrivate
     }
 
     QGeometryData geometry;
-    QGLMaterialCollection *palette;
+    QSharedPointer<QGLMaterialCollection> palette;
     QMatrix4x4 localTransform;
     QVector3D translate;
     QList<QGraphicsTransform3D *> transforms;