summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2019-02-20 18:28:23 +0100
committerSvenn-Arne Dragly <svenn-arne.dragly@qt.io>2019-02-25 14:54:44 +0000
commit84fcc5c5009a7ea6d02981fadd805602c5b40126 (patch)
treeda1ea79463066bc01501b91d700d8efb2b40a72a /src
parent7c062ac8036da56544a08d833aa474ec1b96fa94 (diff)
Dragon: Remove buffer type from comparison
It has been deprecated on QBuffer and is currently uninitialized. Change-Id: Iaf2bcc4cb1647bfd414bcc66a0a9f891f82f5dcc Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/runtime/dragon/geometry/dragonbuffer.cpp2
-rw-r--r--src/runtime/dragon/geometry/dragonbuffer_p.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/runtime/dragon/geometry/dragonbuffer.cpp b/src/runtime/dragon/geometry/dragonbuffer.cpp
index 0a97150..294b18f 100644
--- a/src/runtime/dragon/geometry/dragonbuffer.cpp
+++ b/src/runtime/dragon/geometry/dragonbuffer.cpp
@@ -87,7 +87,7 @@ void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
bool operator ==(const Buffer &a, const Buffer &b)
{
return compareGenerators(a.m_generator, b.m_generator) && a.m_access == b.m_access && a.m_data == b.m_data
- && a.m_type == b.m_type && a.m_usage == b.m_usage;
+ && a.m_usage == b.m_usage;
}
} // Dragon
diff --git a/src/runtime/dragon/geometry/dragonbuffer_p.h b/src/runtime/dragon/geometry/dragonbuffer_p.h
index 63fde0a..eaa1f48 100644
--- a/src/runtime/dragon/geometry/dragonbuffer_p.h
+++ b/src/runtime/dragon/geometry/dragonbuffer_p.h
@@ -69,7 +69,6 @@ public:
QByteArray m_data;
QBuffer::AccessType m_access = QBuffer::Write;
QBufferDataGeneratorPtr m_generator;
- QBuffer::BufferType m_type;
};
bool operator ==(const Buffer &a, const Buffer &b);