diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/render/geometry/buffer_p.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/render/geometry/buffer_p.h')
-rw-r--r-- | src/render/geometry/buffer_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h index d474c1720..691d6cc60 100644 --- a/src/render/geometry/buffer_p.h +++ b/src/render/geometry/buffer_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QBufferUpdate; +struct QBufferUpdate; namespace Render { @@ -77,6 +77,7 @@ 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; } @@ -84,10 +85,12 @@ public: inline bool isDirty() const { return m_bufferDirty; } inline QBufferDataGeneratorPtr dataGenerator() const { return m_functor; } inline bool isSyncData() const { return m_syncData; } + inline QBuffer::AccessType access() const { return m_access; } void unsetDirty(); private: void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL; + void forceDataUpload(); QBuffer::BufferType m_type; QBuffer::UsageType m_usage; @@ -95,6 +98,7 @@ private: QVector<Qt3DRender::QBufferUpdate> m_bufferUpdates; bool m_bufferDirty; bool m_syncData; + QBuffer::AccessType m_access; QBufferDataGeneratorPtr m_functor; BufferManager *m_manager; }; |