QAbstractBuffer/QBuffer cleanup

Remove method that aren't needed anymore since the backend takes care of
creating and abstracting resources to be used with the Graphics Rendering API

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

3 files changed, 2 insertions, 49 deletions

diff --git a/src/core/io/qabstractbuffer.h b/src/core/io/qabstractbuffer.h
index 1b0a8483f..8b68b0e04 100644
--- a/src/core/io/qabstractbuffer.h
+++ b/src/core/io/qabstractbuffer.h
@@ -58,8 +58,8 @@ public:
     virtual void setData(const QByteArray &bytes);
     QByteArray data() const;
 
-    virtual void bind() = 0;
-    virtual void create() = 0;
+    // TO DO: Add a functor here so that we can create CPU side buffer data
+    // in parallel with QAspectJobs
 
 protected:
     QAbstractBuffer(QAbstractBufferPrivate &dd, QNode *parent = 0);
diff --git a/src/render/io/qbuffer.cpp b/src/render/io/qbuffer.cpp
index e9ab21c96..ddaa701e6 100644
--- a/src/render/io/qbuffer.cpp
+++ b/src/render/io/qbuffer.cpp
@@ -111,44 +111,6 @@ void QBuffer::setType(QBuffer::BufferType type)
     }
 }
 
-void QBuffer::bind()
-{
-
-}
-
-void QBuffer::create()
-{
-    // TO DO -> Wrap createGL in here
-}
-
-QOpenGLBuffer QBuffer::createGL() const
-{
-    Q_D(const QBuffer);
-    QOpenGLBuffer b(static_cast<QOpenGLBuffer::Type>(d->m_type));
-    b.setUsagePattern(static_cast<QOpenGLBuffer::UsagePattern>(d->m_usage));
-    if (!b.create())
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer creation failed";
-
-    if (!b.bind())
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer binding failed";
-
-    b.allocate(d->m_data.count());
-    b.release();
-    return b;
-}
-
-void QBuffer::upload(QOpenGLBuffer b)
-{
-    Q_D(QBuffer);
-    if (!b.bind())
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer bind failed";
-    b.allocate(NULL, d->m_data.count()); // orphan the buffer
-    b.allocate(d->m_data.data(),
-               d->m_data.count());
-    b.release();
-    qCDebug(Render::Io) << "uploaded buffer size=" << d->m_data.count();
-}
-
 } // Qt3D
 
 QT_END_NAMESPACE
diff --git a/src/render/io/qbuffer.h b/src/render/io/qbuffer.h
index a5e1ceedc..5e99a1a80 100644
--- a/src/render/io/qbuffer.h
+++ b/src/render/io/qbuffer.h
@@ -91,15 +91,6 @@ public:
     void setType(BufferType type);
     BufferType type() const;
 
-    void bind() Q_DECL_OVERRIDE;
-    void create() Q_DECL_OVERRIDE;
-
-    QOpenGLBuffer createGL() const;
-    void upload(QOpenGLBuffer b);
-
-    // make a QObject and signal when contents change?
-    // GraphicsContext could listen, orphan the QOpenGLBuffer and hence
-    // reupload next time it's need
 protected:
     QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, QNode *parent = 0);
     void copy(const QNode *ref) Q_DECL_OVERRIDE;