Deprecate QBuffer::type

It can also be removed from the backend class, now the renderer doesn't
look at it anyway.

Change-Id: I5643922dccc81c0ee33f80e4b0ea34b63e51d89c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

5 files changed, 20 insertions, 13 deletions

diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 666b5006d..3658ef335 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -51,7 +51,6 @@ namespace Render {
 
 Buffer::Buffer()
     : BackendNode(QBackendNode::ReadWrite)
-    , m_type(QBuffer::VertexBuffer)
     , m_usage(QBuffer::StaticDraw)
     , m_bufferDirty(false)
     , m_syncData(false)
@@ -68,7 +67,6 @@ Buffer::~Buffer()
 
 void Buffer::cleanup()
 {
-    m_type = QBuffer::VertexBuffer;
     m_usage = QBuffer::StaticDraw;
     m_data.clear();
     m_bufferUpdates.clear();
@@ -120,7 +118,6 @@ void Buffer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &chang
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QBufferData>>(change);
     const auto &data = typedChange->data;
     m_data = data.data;
-    m_type = data.type;
     m_usage = data.usage;
     m_syncData = data.syncData;
     m_access = data.access;
@@ -164,9 +161,6 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             Qt3DRender::QBufferUpdate updateData = propertyChange->value().value<Qt3DRender::QBufferUpdate>();
             m_bufferUpdates.push_back(updateData);
             m_bufferDirty = true;
-        } else if (propertyName == QByteArrayLiteral("type")) {
-            m_type = static_cast<QBuffer::BufferType>(propertyChange->value().value<int>());
-            m_bufferDirty = true;
         } else if (propertyName == QByteArrayLiteral("usage")) {
             m_usage = static_cast<QBuffer::UsageType>(propertyChange->value().value<int>());
             m_bufferDirty = true;
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 691d6cc60..dc45e3fbc 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -78,7 +78,6 @@ public:
     void setManager(BufferManager *manager);
     void executeFunctor();
     void updateDataFromGPUToCPU(QByteArray data);
-    inline QBuffer::BufferType type() const { return m_type; }
     inline QBuffer::UsageType usage() const { return m_usage; }
     inline QByteArray data() const { return m_data; }
     inline QVector<Qt3DRender::QBufferUpdate> &pendingBufferUpdates() { return m_bufferUpdates; }
@@ -92,7 +91,6 @@ private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
     void forceDataUpload();
 
-    QBuffer::BufferType m_type;
     QBuffer::UsageType m_usage;
     QByteArray m_data;
     QVector<Qt3DRender::QBufferUpdate> m_bufferUpdates;
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index b978e0e0b..97f037f35 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -77,6 +77,8 @@ QBufferPrivate::QBufferPrivate()
  * \qmlproperty QBuffer::BufferType Buffer::type
  *
  * Holds the buffer type.
+ *
+ * \deprecated
  */
 
 /*!
@@ -220,6 +222,8 @@ QBufferPrivate::QBufferPrivate()
  *        GL_SHADER_STORAGE_BUFFER
  * \value DrawIndirectBuffer
  *        GL_DRAW_INDIRECT_BUFFER
+ *
+ * \deprecated
  */
 
 /*!
@@ -253,7 +257,17 @@ QBufferPrivate::QBufferPrivate()
  */
 
 /*!
+ * Constructs a new QBuffer with \a parent.
+ */
+QBuffer::QBuffer(QNode *parent)
+    : QNode(*new QBufferPrivate(), parent)
+{
+}
+
+/*!
  * Constructs a new QBuffer of buffer type \a ty with \a parent.
+ *
+ * \deprecated
  */
 QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent)
     : QNode(*new QBufferPrivate(), parent)
@@ -360,6 +374,8 @@ void QBuffer::setUsage(QBuffer::UsageType usage)
  * \property QBuffer::type
  *
  * Holds the buffer type.
+ *
+ * \deprecated
  */
 QBuffer::BufferType QBuffer::type() const
 {
@@ -448,7 +464,6 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBuffer::createNodeCreationChange() const
     auto &data = creationChange->data;
     Q_D(const QBuffer);
     data.data = d->m_data;
-    data.type = d->m_type;
     data.usage = d->m_usage;
     data.functor = d->m_functor;
     data.syncData = d->m_syncData;
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index 7cb5acb0a..89b62ab24 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -95,11 +95,12 @@ public:
     };
     Q_ENUM(AccessType) // LCOV_EXCL_LINE
 
-    explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = nullptr);
+    explicit QBuffer(Qt3DCore::QNode *parent = nullptr);
+    QT_DEPRECATED explicit QBuffer(BufferType ty, Qt3DCore::QNode *parent = nullptr);
     ~QBuffer();
 
     UsageType usage() const;
-    BufferType type() const;
+    QT_DEPRECATED BufferType type() const;
     bool isSyncData() const;
     AccessType accessType() const;
 
@@ -112,7 +113,7 @@ public:
     Q_INVOKABLE void updateData(int offset, const QByteArray &bytes);
 
 public Q_SLOTS:
-    void setType(BufferType type);
+    QT_DEPRECATED void setType(BufferType type);
     void setUsage(UsageType usage);
     void setSyncData(bool syncData);
     void setAccessType(AccessType access);
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index a722675ab..a342518e0 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -80,7 +80,6 @@ public:
 struct QBufferData
 {
     QByteArray data;
-    QBuffer::BufferType type;
     QBuffer::UsageType usage;
     QBufferDataGeneratorPtr functor;
     bool syncData;