Remove buffer functor API

Change-Id: I78cc60ff634f909111b891d5b9716e19cae35f3b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

9 files changed, 0 insertions, 167 deletions

diff --git a/tests/auto/extras/common/geometrytesthelper.h b/tests/auto/extras/common/geometrytesthelper.h
index 5b04a078b..b825fa407 100644
--- a/tests/auto/extras/common/geometrytesthelper.h
+++ b/tests/auto/extras/common/geometrytesthelper.h
@@ -31,36 +31,8 @@
 
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DRender/qgeometry.h>
 
-inline void generateGeometry(Qt3DRender::QGeometry &geometry)
-{
-    // Get all attributes
-    const QVector<Qt3DRender::QAttribute *> attributes = geometry.attributes();
-
-    // Get all unique data generators from the buffers referenced by the attributes
-    QHash<Qt3DRender::QBufferDataGeneratorPtr, Qt3DRender::QBuffer *> dataGenerators;
-    for (const auto attribute : attributes) {
-        QT_WARNING_PUSH
-        QT_WARNING_DISABLE_DEPRECATED
-        const auto dataGenerator = attribute->buffer()->dataGenerator();
-        if (!dataGenerators.contains(dataGenerator))
-            dataGenerators.insert(dataGenerator, attribute->buffer());
-        QT_WARNING_POP
-    }
-
-    // Generate data for each buffer
-    const auto end = dataGenerators.end();
-    for (auto it = dataGenerators.begin(); it != end; ++it) {
-        Qt3DRender::QBufferDataGeneratorPtr dataGenerator = it.key();
-        const QByteArray data = (*dataGenerator)();
-
-        Qt3DRender::QBuffer *buffer = it.value();
-        buffer->setData(data);
-    }
-}
-
 template<typename IndexType>
 IndexType extractIndexData(Qt3DRender::QAttribute *attribute, int index)
 {
diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
index 838e5dea9..f20b1e870 100644
--- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
+++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
@@ -31,7 +31,6 @@
 #include <Qt3DExtras/qcuboidgeometry.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferdatagenerator.h>
 #include <qopenglcontext.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
@@ -542,8 +541,6 @@ private Q_SLOTS:
         geometry.setYZMeshResolution(yzMeshResolution);
         geometry.setXZMeshResolution(xzMeshResolution);
 
-        generateGeometry(geometry);
-
         // THEN
 
         // Check buffer of each attribute is valid and actually has some data
diff --git a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
index bf5651c9c..7a6965f20 100644
--- a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
+++ b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
@@ -31,7 +31,6 @@
 #include <Qt3DExtras/qtorusgeometry.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferdatagenerator.h>
 #include <qopenglcontext.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
@@ -317,8 +316,6 @@ private Q_SLOTS:
         geometry.setRadius(radius);
         geometry.setMinorRadius(minorRadius);
 
-        generateGeometry(geometry);
-
         // THEN
 
         // Check buffer of each attribute is valid and actually has some data
diff --git a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
index 4645a7c02..6c5473cff 100644
--- a/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
+++ b/tests/auto/render/boundingsphere/tst_boundingsphere.cpp
@@ -53,7 +53,6 @@
 #include <Qt3DRender/private/updateworldtransformjob_p.h>
 #include <Qt3DRender/private/expandboundingvolumejob_p.h>
 #include <Qt3DRender/private/calcboundingvolumejob_p.h>
-#include <Qt3DRender/private/loadbufferjob_p.h>
 #include <Qt3DRender/private/buffermanager_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DRender/private/sphere_p.h>
@@ -160,14 +159,6 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
     updateWorldTransform.setManagers(test->nodeManagers());
     updateWorldTransform.run();
 
-    // For each buffer
-    QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
-    for (auto bufferHandle : bufferHandles) {
-        Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
-        loadBuffer.setNodeManager(test->nodeManagers());
-        loadBuffer.run();
-    }
-
     Qt3DRender::Render::CalculateBoundingVolumeJob calcBVolume;
     calcBVolume.setManagers(test->nodeManagers());
     calcBVolume.setRoot(test->sceneRoot());
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index c021ea805..25c4a9633 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -39,32 +39,6 @@ QT_WARNING_DISABLE_DEPRECATED
 #include "testarbiter.h"
 #include "testrenderer.h"
 
-class TestFunctor : public Qt3DRender::QBufferDataGenerator
-{
-public:
-    explicit TestFunctor(int size)
-        : m_size(size)
-    {}
-
-    QByteArray operator ()() final
-    {
-        return QByteArrayLiteral("454");
-    }
-
-    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const final
-    {
-        const TestFunctor *otherFunctor = Qt3DRender::functor_cast<TestFunctor>(&other);
-        if (otherFunctor != nullptr)
-            return otherFunctor->m_size == m_size;
-        return false;
-    }
-
-    QT3D_FUNCTOR(TestFunctor)
-
-private:
-    int m_size;
-};
-
 class tst_RenderBuffer : public Qt3DCore::QBackendNodeTester
 {
     Q_OBJECT
@@ -81,7 +55,6 @@ private Q_SLOTS:
 
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("Corvette"));
-        buffer.setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(883)));
 
         // WHEN
         renderBuffer.setRenderer(&renderer);
@@ -93,8 +66,6 @@ private Q_SLOTS:
         QCOMPARE(renderBuffer.isDirty(), true);
         QCOMPARE(renderBuffer.usage(), buffer.usage());
         QCOMPARE(renderBuffer.data(), buffer.data());
-        QCOMPARE(renderBuffer.dataGenerator(), buffer.dataGenerator());
-        QVERIFY(*renderBuffer.dataGenerator() == *buffer.dataGenerator());
         QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 1);
         QCOMPARE(renderBuffer.pendingBufferUpdates().first().offset, -1);
     }
@@ -111,7 +82,6 @@ private Q_SLOTS:
         QCOMPARE(backendBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(backendBuffer.data().isEmpty());
         QVERIFY(backendBuffer.peerId().isNull());
-        QVERIFY(backendBuffer.dataGenerator().isNull());
         QVERIFY(backendBuffer.pendingBufferUpdates().empty());
 
         // GIVEN
@@ -126,20 +96,17 @@ private Q_SLOTS:
         QCOMPARE(backendBuffer.isDirty(), true);
         QCOMPARE(backendBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(backendBuffer.data().isEmpty());
-        QVERIFY(backendBuffer.dataGenerator().isNull());
         QVERIFY(backendBuffer.pendingBufferUpdates().empty());
 
         // WHEN
         frontendBuffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         frontendBuffer.setData(QByteArrayLiteral("C7KR4"));
-        frontendBuffer.setDataGenerator(Qt3DRender::QBufferDataGeneratorPtr(new TestFunctor(73)));
         backendBuffer.syncFromFrontEnd(&frontendBuffer, false);
 
         // THEN
         QCOMPARE(backendBuffer.usage(), Qt3DRender::QBuffer::DynamicCopy);
         QCOMPARE(backendBuffer.isDirty(), true);
         QCOMPARE(backendBuffer.data(), QByteArrayLiteral("C7KR4"));
-        QVERIFY(!backendBuffer.dataGenerator().isNull());
         QVERIFY(!backendBuffer.pendingBufferUpdates().empty());
 
         // WHEN
@@ -156,7 +123,6 @@ private Q_SLOTS:
         QCOMPARE(backendBuffer.isDirty(), false);
         QCOMPARE(backendBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(backendBuffer.data().isEmpty());
-        QVERIFY(backendBuffer.dataGenerator().isNull());
         QVERIFY(backendBuffer.pendingBufferUpdates().empty());
     }
 
@@ -264,21 +230,6 @@ private Q_SLOTS:
         QVERIFY(!backendBuffer.isDirty());
 
         // WHEN
-        Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355));
-        frontendBuffer.setDataGenerator(functor);
-        backendBuffer.syncFromFrontEnd(&frontendBuffer, false);
-
-        // THEN
-        QCOMPARE(backendBuffer.dataGenerator(), functor);
-        QVERIFY(backendBuffer.isDirty());
-
-        QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::BuffersDirty);
-        renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
-
-        backendBuffer.unsetDirty();
-        QVERIFY(!backendBuffer.isDirty());
-
-        // WHEN
         frontendBuffer.setSyncData(true);
         backendBuffer.syncFromFrontEnd(&frontendBuffer, false);
 
@@ -290,17 +241,6 @@ private Q_SLOTS:
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
 
         // WHEN
-        TestArbiter arbiter;
-        backendBuffer.executeFunctor();
-
-        // THEN
-        QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1);
-        QCOMPARE(backendBuffer.pendingBufferUpdates().first().offset, -1);
-
-        arbiter.clear();
-        backendBuffer.pendingBufferUpdates().clear();
-
-        // WHEN
         frontendBuffer.updateData(2, QByteArrayLiteral("LS5"));
         backendBuffer.syncFromFrontEnd(&frontendBuffer, false);
 
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
index e84be5815..ea809cf50 100644
--- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
+++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
@@ -59,7 +59,6 @@
 #include <Qt3DRender/private/updateworldtransformjob_p.h>
 #include <Qt3DRender/private/expandboundingvolumejob_p.h>
 #include <Qt3DRender/private/calcboundingvolumejob_p.h>
-#include <Qt3DRender/private/loadbufferjob_p.h>
 #include <Qt3DRender/private/buffermanager_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DRender/private/qobjectpicker_p.h>
@@ -181,14 +180,6 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
     updateWorldTransform.setManagers(test->nodeManagers());
     updateWorldTransform.run();
 
-    // For each buffer
-    QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
-    for (auto bufferHandle : bufferHandles) {
-        Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
-        loadBuffer.setNodeManager(test->nodeManagers());
-        loadBuffer.run();
-    }
-
     Qt3DRender::Render::CalculateBoundingVolumeJob calcBVolume;
     calcBVolume.setManagers(test->nodeManagers());
     calcBVolume.setRoot(test->sceneRoot());
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index d9800c24f..acc9664bf 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -38,7 +38,6 @@
 #include <Qt3DExtras/qspheremesh.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qbufferdatagenerator.h>
 #include <Qt3DExtras/qspheregeometry.h>
 #include <Qt3DRender/qpickevent.h>
 
@@ -75,13 +74,6 @@ public:
         QAttribute *positionAttr = static_cast<QAttribute *>(g->attributes().first());
         Qt3DRender::QBuffer *vertexBuffer = static_cast<Qt3DRender::QBuffer *>(positionAttr->buffer());
 
-        // Load the geometry
-        QT_WARNING_PUSH
-        QT_WARNING_DISABLE_DEPRECATED
-        const QByteArray data = (*vertexBuffer->dataGenerator())();
-        vertexBuffer->setData(data);
-        QT_WARNING_POP
-
         transform->setTranslation(position);
 
         addComponent(picker);
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index cbb141d2e..0f0a101d3 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -36,36 +36,9 @@ QT_WARNING_DISABLE_DEPRECATED
 
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/private/qbuffer_p.h>
-#include <Qt3DRender/qbufferdatagenerator.h>
 
 #include "testarbiter.h"
 
-class TestFunctor : public Qt3DRender::QBufferDataGenerator
-{
-public:
-    explicit TestFunctor(int size)
-        : m_size(size)
-    {}
-
-    QByteArray operator ()() final
-    {
-        return QByteArray();
-    }
-
-    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const final
-    {
-        const TestFunctor *otherFunctor = Qt3DRender::functor_cast<TestFunctor>(&other);
-        if (otherFunctor != nullptr)
-            return otherFunctor->m_size == m_size;
-        return false;
-    }
-
-    QT3D_FUNCTOR(TestFunctor)
-
-private:
-    int m_size;
-};
-
 class tst_QBuffer: public QObject
 {
     Q_OBJECT
@@ -98,17 +71,6 @@ private Q_SLOTS:
         arbiter.clear();
 
         // WHEN
-        Qt3DRender::QBufferDataGeneratorPtr functor(new TestFunctor(355));
-        buffer->setDataGenerator(functor);
-        QCoreApplication::processEvents();
-
-        // THEN
-        QCOMPARE(arbiter.dirtyNodes().size(), 1);
-        QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
-
-        arbiter.clear();
-
-        // WHEN
         buffer->setSyncData(true);
 
         // THEN
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
index fd438ab2f..2908842eb 100644
--- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
+++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
@@ -55,7 +55,6 @@
 #include <Qt3DRender/private/updateworldtransformjob_p.h>
 #include <Qt3DRender/private/expandboundingvolumejob_p.h>
 #include <Qt3DRender/private/calcboundingvolumejob_p.h>
-#include <Qt3DRender/private/loadbufferjob_p.h>
 #include <Qt3DRender/private/buffermanager_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 
@@ -177,14 +176,6 @@ void runRequiredJobs(Qt3DRender::TestAspect *test)
     updateWorldTransform.setManagers(test->nodeManagers());
     updateWorldTransform.run();
 
-    // For each buffer
-    QVector<Qt3DRender::Render::HBuffer> bufferHandles = test->nodeManagers()->bufferManager()->activeHandles();
-    for (auto bufferHandle : bufferHandles) {
-        Qt3DRender::Render::LoadBufferJob loadBuffer(bufferHandle);
-        loadBuffer.setNodeManager(test->nodeManagers());
-        loadBuffer.run();
-    }
-
     Qt3DRender::Render::CalculateBoundingVolumeJob calcBVolume;
     calcBVolume.setManagers(test->nodeManagers());
     calcBVolume.setRoot(test->sceneRoot());