summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/render/geometry/buffer.cpp3
-rw-r--r--src/render/geometry/buffer_p.h2
-rw-r--r--src/render/geometry/qbuffer.cpp37
-rw-r--r--src/render/geometry/qbuffer.h4
-rw-r--r--src/render/geometry/qbuffer_p.h1
-rw-r--r--tests/auto/render/buffer/tst_buffer.cpp8
-rw-r--r--tests/auto/render/qbuffer/tst_qbuffer.cpp9
7 files changed, 0 insertions, 64 deletions
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 4d3d5c1aa..5b577b546 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -52,7 +52,6 @@ Buffer::Buffer()
: BackendNode(QBackendNode::ReadWrite)
, m_usage(QBuffer::StaticDraw)
, m_bufferDirty(false)
- , m_syncData(false)
, m_access(QBuffer::Write)
, m_manager(nullptr)
{
@@ -70,7 +69,6 @@ void Buffer::cleanup()
m_data.clear();
m_bufferUpdates.clear();
m_bufferDirty = false;
- m_syncData = false;
m_access = QBuffer::Write;
}
@@ -110,7 +108,6 @@ void Buffer::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
m_bufferDirty = true;
}
- m_syncData = node->isSyncData();
m_access = node->accessType();
if (m_usage != node->usage()) {
m_usage = node->usage();
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 41a525fc2..c2e40ed88 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -80,7 +80,6 @@ public:
inline QByteArray data() const { return m_data; }
inline QVector<Qt3DRender::QBufferUpdate> &pendingBufferUpdates() { return m_bufferUpdates; }
inline bool isDirty() const { return m_bufferDirty; }
- inline bool isSyncData() const { return m_syncData; }
inline QBuffer::AccessType access() const { return m_access; }
void unsetDirty();
@@ -91,7 +90,6 @@ private:
QByteArray m_data;
QVector<Qt3DRender::QBufferUpdate> m_bufferUpdates;
bool m_bufferDirty;
- bool m_syncData;
QBuffer::AccessType m_access;
BufferManager *m_manager;
};
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index dc2833158..58ff304a0 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -51,7 +51,6 @@ QBufferPrivate::QBufferPrivate()
: QNodePrivate()
, m_type(QBuffer::VertexBuffer)
, m_usage(QBuffer::StaticDraw)
- , m_syncData(false)
, m_access(QBuffer::Write)
{
}
@@ -89,17 +88,6 @@ void QBufferPrivate::setData(const QByteArray &data)
*/
/*!
- * \qmlproperty bool Buffer::syncData
- *
- * Holds the syncData flag. When syncData is true, this will force data created
- * by a Qt3DRender::QBufferDataGenerator to also be updated on the frontend
- * Qt3DRender::QBuffer node. By default syncData is false.
- *
- * \note: This has no effect if the buffer's data was set directly using the data
- * property.
- */
-
-/*!
* \class Qt3DRender::QBuffer
* \inheaderfile Qt3DRender/QBuffer
* \inmodule Qt3DRender
@@ -290,25 +278,6 @@ QBuffer::BufferType QBuffer::type() const
return d->m_type;
}
-/*!
- * \property QBuffer::syncData
- *
- * Holds the syncData flag. When syncData is true, this will force data created
- * by a Qt3DRender::QBufferDataGenerator to also be updated on the frontend
- * Qt3DRender::QBuffer node. By default syncData is false.
- *
- * \note: This has no effect if the buffer's data was set directly using the data
- * property.
- */
-void QBuffer::setSyncData(bool syncData)
-{
- Q_D(QBuffer);
- if (d->m_syncData != syncData) {
- d->m_syncData = syncData;
- emit syncDataChanged(syncData);
- }
-}
-
void QBuffer::setAccessType(QBuffer::AccessType access)
{
Q_D(QBuffer);
@@ -318,12 +287,6 @@ void QBuffer::setAccessType(QBuffer::AccessType access)
}
}
-bool QBuffer::isSyncData() const
-{
- Q_D(const QBuffer);
- return d->m_syncData;
-}
-
/*!
* \property Qt3DRender::QBuffer::accessType
*
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index a4de25eae..fceeea2dc 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -56,7 +56,6 @@ class Q_3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode
Q_OBJECT
Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(UsageType usage READ usage WRITE setUsage NOTIFY usageChanged)
- Q_PROPERTY(bool syncData READ isSyncData WRITE setSyncData NOTIFY syncDataChanged)
Q_PROPERTY(AccessType accessType READ accessType WRITE setAccessType NOTIFY accessTypeChanged REVISION 9)
public:
@@ -99,7 +98,6 @@ public:
UsageType usage() const;
QT_DEPRECATED BufferType type() const;
- bool isSyncData() const;
AccessType accessType() const;
void setData(const QByteArray &bytes);
@@ -110,14 +108,12 @@ public:
public Q_SLOTS:
QT_DEPRECATED void setType(BufferType type);
void setUsage(UsageType usage);
- void setSyncData(bool syncData);
void setAccessType(AccessType access);
Q_SIGNALS:
void dataChanged(const QByteArray &bytes);
void typeChanged(BufferType type);
void usageChanged(UsageType usage);
- void syncDataChanged(bool syncData);
void accessTypeChanged(AccessType access);
void dataAvailable();
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index 082249d3c..b6d6318b4 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -71,7 +71,6 @@ public:
QByteArray m_data;
QBuffer::BufferType m_type;
QBuffer::UsageType m_usage;
- bool m_syncData;
QBuffer::AccessType m_access;
void setData(const QByteArray &data);
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index 25c4a9633..b9284623d 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -229,14 +229,6 @@ private Q_SLOTS:
backendBuffer.unsetDirty();
QVERIFY(!backendBuffer.isDirty());
- // WHEN
- frontendBuffer.setSyncData(true);
- backendBuffer.syncFromFrontEnd(&frontendBuffer, false);
-
- // THEN
- QCOMPARE(backendBuffer.isSyncData(), true);
- QVERIFY(!backendBuffer.isDirty());
-
QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::BuffersDirty);
renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index 0f0a101d3..34cfe4941 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -71,15 +71,6 @@ private Q_SLOTS:
arbiter.clear();
// WHEN
- buffer->setSyncData(true);
-
- // THEN
- QCOMPARE(arbiter.dirtyNodes().size(), 1);
- QCOMPARE(arbiter.dirtyNodes().front(), buffer.data());
-
- arbiter.clear();
-
- // WHEN
buffer->updateData(1, QByteArrayLiteral("L1"));
QCoreApplication::processEvents();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 01:23:36 +0000