Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: Iea56f1fbbed89cf6b73bc8ea1bcba0b0060f5ac5

2 files changed, 7 insertions, 11 deletions

diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp
index 95e56f3b1..46e912a4e 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp
@@ -152,7 +152,6 @@ void BaseGeometryLoader::generateGeometry()
     } // of buffer filling loop
 
     QBuffer *buf = new QBuffer();
-    buf->setType(QBuffer::VertexBuffer);
     buf->setData(bufferBytes);
 
     if (m_geometry)
@@ -199,7 +198,6 @@ void BaseGeometryLoader::generateGeometry()
     }
 
     QBuffer *indexBuffer = new QBuffer();
-    indexBuffer->setType(QBuffer::IndexBuffer);
     indexBuffer->setData(indexBytes);
     QAttribute *indexAttribute = new QAttribute(indexBuffer, ty, 1, m_indices.size());
     indexAttribute->setAttributeType(QAttribute::IndexAttribute);
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
index b16f87f02..ddb950f86 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
@@ -303,11 +303,11 @@ void GLTFGeometryLoader::processJSONBufferView(const QString &id, const QJsonObj
     const auto &bufferData = *it;
 
     int target = json.value(KEY_TARGET).toInt();
-    Qt3DRender::QBuffer::BufferType ty(Qt3DRender::QBuffer::VertexBuffer);
 
     switch (target) {
-    case GL_ARRAY_BUFFER:           ty = Qt3DRender::QBuffer::VertexBuffer; break;
-    case GL_ELEMENT_ARRAY_BUFFER:   ty = Qt3DRender::QBuffer::IndexBuffer; break;
+    case GL_ARRAY_BUFFER:
+    case GL_ELEMENT_ARRAY_BUFFER:
+        break;
     default:
         qCWarning(GLTFGeometryLoaderLog, "buffer %ls unsupported target: %d",
                   qUtf16PrintableImpl(id), target);
@@ -330,7 +330,6 @@ void GLTFGeometryLoader::processJSONBufferView(const QString &id, const QJsonObj
     }
 
     Qt3DRender::QBuffer *b = new Qt3DRender::QBuffer();
-    b->setType(ty);
     b->setData(bytes);
     m_gltf1.m_buffers[id] = b;
 }
@@ -345,11 +344,10 @@ void GLTFGeometryLoader::processJSONBufferViewV2(const QJsonObject &json)
     const auto bufferData = m_gltf2.m_bufferDatas[bufferIndex];
 
     int target = json.value(KEY_TARGET).toInt();
-    Qt3DRender::QBuffer::BufferType ty(Qt3DRender::QBuffer::VertexBuffer);
-
     switch (target) {
-    case GL_ARRAY_BUFFER:           ty = Qt3DRender::QBuffer::VertexBuffer; break;
-    case GL_ELEMENT_ARRAY_BUFFER:   ty = Qt3DRender::QBuffer::IndexBuffer; break;
+    case GL_ARRAY_BUFFER:
+    case GL_ELEMENT_ARRAY_BUFFER:
+        break;
     default:
         return;
     }
@@ -368,7 +366,7 @@ void GLTFGeometryLoader::processJSONBufferViewV2(const QJsonObject &json)
                   qUtf16PrintableImpl(bufferData.path));
     }
 
-    Qt3DRender::QBuffer *b(new Qt3DRender::QBuffer(ty));
+    auto b = new Qt3DRender::QBuffer;
     b->setData(bytes);
     m_gltf2.m_buffers.push_back(b);
 }