QGeometryRenderer API changes

- primitiveCount -> vertexCount
- baseInstance -> firstInstance
- restartIndex -> restartIndexValue
- primitiveRestart -> primitiveRestartEnabled
- baseVertex -> indexOffset

Task-number: QTBUG-51515
Change-Id: I95e1e04e08b6441fcf8721db382f8f0c457f6faa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

12 files changed, 137 insertions, 137 deletions

diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 3afc92731..1719cdd65 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -808,8 +808,8 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv
     if (rGeometryRenderer->primitiveType() == QGeometryRenderer::Patches)
         m_graphicsContext->setVerticesPerPatch(rGeometryRenderer->verticesPerPatch());
 
-    if (rGeometryRenderer->primitiveRestart())
-        m_graphicsContext->enablePrimitiveRestart(rGeometryRenderer->restartIndex());
+    if (rGeometryRenderer->primitiveRestartEnabled())
+        m_graphicsContext->enablePrimitiveRestart(rGeometryRenderer->restartIndexValue());
 
     // TO DO: Add glMulti Draw variants
     if (drawIndexed)
@@ -818,10 +818,10 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv
                                                  indexType,
                                                  reinterpret_cast<void*>(quintptr(indexAttribute->byteOffset())),
                                                  rGeometryRenderer->instanceCount(),
-                                                 rGeometryRenderer->baseVertex());
+                                                 rGeometryRenderer->indexOffset());
     else
         m_graphicsContext->drawArraysInstanced(primType,
-                                               rGeometryRenderer->baseInstance(),
+                                               rGeometryRenderer->firstInstance(),
                                                primitiveCount,
                                                rGeometryRenderer->instanceCount());
 
@@ -831,7 +831,7 @@ void Renderer::performDraw(GeometryRenderer *rGeometryRenderer, GLsizei primitiv
         qCWarning(Rendering) << "GL error after drawing mesh:" << QString::number(err, 16);
 #endif
 
-    if (rGeometryRenderer->primitiveRestart())
+    if (rGeometryRenderer->primitiveRestartEnabled())
         m_graphicsContext->disablePrimitiveRestart();
 
     // Unset dirtiness on rGeometryRenderer only
@@ -944,7 +944,7 @@ bool Renderer::executeCommands(const RenderView *rv)
             Attribute *indexAttribute = Q_NULLPTR;
             bool specified = false;
             const bool requiresVAOUpdate = (!vao || !vao->isSpecified()) || (rGeometry->isDirty() || rGeometryRenderer->isDirty());
-            GLsizei primitiveCount = rGeometryRenderer->primitiveCount();
+            GLsizei primitiveCount = rGeometryRenderer->vertexCount();
 
             // Append dirty Geometry to temporary vector
             // so that its dirtiness can be unset later
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index ec222d53e..0d494ba85 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -54,12 +54,12 @@ namespace Render {
 GeometryRenderer::GeometryRenderer()
     : BackendNode(ReadWrite)
     , m_instanceCount(0)
-    , m_primitiveCount(0)
-    , m_baseVertex(0)
-    , m_baseInstance(0)
-    , m_restartIndex(-1)
+    , m_vertexCount(0)
+    , m_indexOffset(0)
+    , m_firstInstance(0)
+    , m_restartIndexValue(-1)
     , m_verticesPerPatch(0)
-    , m_primitiveRestart(false)
+    , m_primitiveRestartEnabled(false)
     , m_primitiveType(QGeometryRenderer::Triangles)
     , m_dirty(false)
     , m_enabled(true)
@@ -74,12 +74,12 @@ GeometryRenderer::~GeometryRenderer()
 void GeometryRenderer::cleanup()
 {
     m_instanceCount = 0;
-    m_primitiveCount = 0;
-    m_baseVertex = 0;
-    m_baseInstance = 0;
-    m_restartIndex = -1;
+    m_vertexCount = 0;
+    m_indexOffset = 0;
+    m_firstInstance = 0;
+    m_restartIndexValue = -1;
     m_verticesPerPatch = 0;
-    m_primitiveRestart = false;
+    m_primitiveRestartEnabled = false;
     m_primitiveType = QGeometryRenderer::Triangles;
     m_geometryId = Qt3DCore::QNodeId();
     m_dirty = false;
@@ -99,12 +99,12 @@ void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer)
     QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer);
     if (geometryRenderer) {
         m_instanceCount = geometryRenderer->instanceCount();
-        m_primitiveCount = geometryRenderer->primitiveCount();
-        m_baseVertex = geometryRenderer->baseVertex();
-        m_baseInstance = geometryRenderer->baseInstance();
-        m_restartIndex = geometryRenderer->restartIndex();
+        m_vertexCount = geometryRenderer->vertexCount();
+        m_indexOffset = geometryRenderer->indexOffset();
+        m_firstInstance = geometryRenderer->firstInstance();
+        m_restartIndexValue = geometryRenderer->restartIndexValue();
         m_verticesPerPatch = geometryRenderer->verticesPerPatch();
-        m_primitiveRestart = geometryRenderer->primitiveRestart();
+        m_primitiveRestartEnabled = geometryRenderer->primitiveRestartEnabled();
         m_primitiveType = geometryRenderer->primitiveType();
         m_enabled = geometryRenderer->isEnabled();
         if (geometryRenderer->geometry() != Q_NULLPTR)
@@ -127,23 +127,23 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
         if (propertyName == QByteArrayLiteral("instanceCount")) {
             m_instanceCount = propertyChange->value().value<int>();
             m_dirty = true;
-        } else if (propertyName == QByteArrayLiteral("primitiveCount")) {
-            m_primitiveCount = propertyChange->value().value<int>();
+        } else if (propertyName == QByteArrayLiteral("vertexCount")) {
+            m_vertexCount = propertyChange->value().value<int>();
             m_dirty = true;
-        } else if (propertyName == QByteArrayLiteral("baseVertex")) {
-            m_baseVertex = propertyChange->value().value<int>();
+        } else if (propertyName == QByteArrayLiteral("indexOffset")) {
+            m_indexOffset = propertyChange->value().value<int>();
             m_dirty = true;
-        } else if (propertyName == QByteArrayLiteral("baseInstance")) {
-            m_baseInstance = propertyChange->value().value<int>();
+        } else if (propertyName == QByteArrayLiteral("firstInstance")) {
+            m_firstInstance = propertyChange->value().value<int>();
             m_dirty = true;
-        } else if (propertyName == QByteArrayLiteral("restartIndex")) {
-            m_restartIndex = propertyChange->value().value<int>();
+        } else if (propertyName == QByteArrayLiteral("restartIndexValue")) {
+            m_restartIndexValue = propertyChange->value().value<int>();
             m_dirty = true;
         } else if (propertyName == QByteArrayLiteral("verticesPerPatch")) {
             m_verticesPerPatch = propertyChange->value().value<int>();
             m_dirty = true;
-        } else if (propertyName == QByteArrayLiteral("primitiveRestart")) {
-            m_primitiveRestart = propertyChange->value().value<bool>();
+        } else if (propertyName == QByteArrayLiteral("primitiveRestartEnabled")) {
+            m_primitiveRestartEnabled = propertyChange->value().value<bool>();
             m_dirty = true;
         } else if (propertyName == QByteArrayLiteral("enabled")) {
             m_enabled = propertyChange->value().value<bool>();
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index b94c18dc9..5ca5296e1 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -79,12 +79,12 @@ public:
 
     inline Qt3DCore::QNodeId geometryId() const { return m_geometryId; }
     inline int instanceCount() const { return m_instanceCount; }
-    inline int primitiveCount() const { return m_primitiveCount; }
-    inline int baseVertex() const { return m_baseVertex; }
-    inline int baseInstance() const { return m_baseInstance; }
-    inline int restartIndex() const { return m_restartIndex; }
+    inline int vertexCount() const { return m_vertexCount; }
+    inline int indexOffset() const { return m_indexOffset; }
+    inline int firstInstance() const { return m_firstInstance; }
+    inline int restartIndexValue() const { return m_restartIndexValue; }
     inline int verticesPerPatch() const { return m_verticesPerPatch; }
-    inline bool primitiveRestart() const { return m_primitiveRestart; }
+    inline bool primitiveRestartEnabled() const { return m_primitiveRestartEnabled; }
     inline QGeometryRenderer::PrimitiveType primitiveType() const { return m_primitiveType; }
     inline bool isDirty() const { return m_dirty; }
     inline bool isEnabled() const { return m_enabled; }
@@ -99,12 +99,12 @@ public:
 private:
     Qt3DCore::QNodeId m_geometryId;
     int m_instanceCount;
-    int m_primitiveCount;
-    int m_baseVertex;
-    int m_baseInstance;
-    int m_restartIndex;
+    int m_vertexCount;
+    int m_indexOffset;
+    int m_firstInstance;
+    int m_restartIndexValue;
     int m_verticesPerPatch;
-    bool m_primitiveRestart;
+    bool m_primitiveRestartEnabled;
     QGeometryRenderer::PrimitiveType m_primitiveType;
     bool m_dirty;
     bool m_enabled;
diff --git a/src/render/geometry/qconemesh.h b/src/render/geometry/qconemesh.h
index 025489668..1b0b7ca99 100644
--- a/src/render/geometry/qconemesh.h
+++ b/src/render/geometry/qconemesh.h
@@ -93,11 +93,11 @@ private:
     // to modify the QGeometryRenderer's properties
 
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };
diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h
index 784f53ecb..920c6aed2 100644
--- a/src/render/geometry/qcuboidmesh.h
+++ b/src/render/geometry/qcuboidmesh.h
@@ -92,11 +92,11 @@ private:
     // to modify the QGeometryRenderer's properties
 
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };
diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h
index 87ecc8e79..c26fa9ddd 100644
--- a/src/render/geometry/qcylindermesh.h
+++ b/src/render/geometry/qcylindermesh.h
@@ -81,11 +81,11 @@ private:
     // to modify the QGeometryRenderer's properties
 
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index c89a8b417..bff87c70e 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -52,10 +52,10 @@ namespace Qt3DRender {
 QGeometryRendererPrivate::QGeometryRendererPrivate()
     : QComponentPrivate()
     , m_instanceCount(1)
-    , m_primitiveCount(0)
-    , m_baseVertex(0)
-    , m_baseInstance(0)
-    , m_restartIndex(-1)
+    , m_vertexCount(0)
+    , m_indexOffset(0)
+    , m_firstInstance(0)
+    , m_restartIndexValue(-1)
     , m_verticesPerPatch(0)
     , m_primitiveRestart(false)
     , m_geometry(Q_NULLPTR)
@@ -76,19 +76,19 @@ QGeometryRendererPrivate::QGeometryRendererPrivate()
  */
 
 /*!
- * \qmlproperty int GeometryRenderer::primitiveCount
+ * \qmlproperty int GeometryRenderer::vertexCount
  *
- * Holds the primitive count.
+ * Holds the vertex count.
  */
 
 /*!
- * \qmlproperty int GeometryRenderer::baseVertex
+ * \qmlproperty int GeometryRenderer::indexOffset
  *
  * Holds the base vertex.
  */
 
 /*!
- * \qmlproperty int GeometryRenderer::baseInstance
+ * \qmlproperty int GeometryRenderer::firstInstance
  *
  * Holds the base instance.
  */
@@ -186,36 +186,36 @@ int QGeometryRenderer::instanceCount() const
 }
 
 /*!
- * \property QGeometryRenderer::primitiveCount
+ * \property QGeometryRenderer::vertexCount
  *
  * Holds the primitive count.
  */
-int QGeometryRenderer::primitiveCount() const
+int QGeometryRenderer::vertexCount() const
 {
     Q_D(const QGeometryRenderer);
-    return d->m_primitiveCount;
+    return d->m_vertexCount;
 }
 
 /*!
- * \property QGeometryRenderer::baseVertex
+ * \property QGeometryRenderer::indexOffset
  *
  * Holds the base vertex.
  */
-int QGeometryRenderer::baseVertex() const
+int QGeometryRenderer::indexOffset() const
 {
     Q_D(const QGeometryRenderer);
-    return d->m_baseVertex;
+    return d->m_indexOffset;
 }
 
 /*!
- * \property QGeometryRenderer::baseInstance
+ * \property QGeometryRenderer::firstInstance
  *
  * Holds the base instance.
  */
-int QGeometryRenderer::baseInstance() const
+int QGeometryRenderer::firstInstance() const
 {
     Q_D(const QGeometryRenderer);
-    return d->m_baseInstance;
+    return d->m_firstInstance;
 }
 
 /*!
@@ -223,10 +223,10 @@ int QGeometryRenderer::baseInstance() const
  *
  * Holds the restart index.
  */
-int QGeometryRenderer::restartIndex() const
+int QGeometryRenderer::restartIndexValue() const
 {
     Q_D(const QGeometryRenderer);
-    return d->m_restartIndex;
+    return d->m_restartIndexValue;
 }
 
 /*!
@@ -245,7 +245,7 @@ int QGeometryRenderer::verticesPerPatch() const
  *
  * Holds the primitive restart flag.
  */
-bool QGeometryRenderer::primitiveRestart() const
+bool QGeometryRenderer::primitiveRestartEnabled() const
 {
     Q_D(const QGeometryRenderer);
     return d->m_primitiveRestart;
@@ -292,44 +292,44 @@ void QGeometryRenderer::setInstanceCount(int instanceCount)
     emit instanceCountChanged(instanceCount);
 }
 
-void QGeometryRenderer::setPrimitiveCount(int primitiveCount)
+void QGeometryRenderer::setVertexCount(int vertexCount)
 {
     Q_D(QGeometryRenderer);
-    if (d->m_primitiveCount == primitiveCount)
+    if (d->m_vertexCount == vertexCount)
         return;
 
-    d->m_primitiveCount = primitiveCount;
-    emit primitiveCountChanged(primitiveCount);
+    d->m_vertexCount = vertexCount;
+    emit vertexCountChanged(vertexCount);
 }
 
-void QGeometryRenderer::setBaseVertex(int baseVertex)
+void QGeometryRenderer::setIndexOffset(int indexOffset)
 {
     Q_D(QGeometryRenderer);
-    if (d->m_baseVertex == baseVertex)
+    if (d->m_indexOffset == indexOffset)
         return;
 
-    d->m_baseVertex = baseVertex;
-    emit baseVertexChanged(baseVertex);
+    d->m_indexOffset = indexOffset;
+    emit indexOffsetChanged(indexOffset);
 }
 
-void QGeometryRenderer::setBaseInstance(int baseInstance)
+void QGeometryRenderer::setFirstInstance(int firstInstance)
 {
     Q_D(QGeometryRenderer);
-    if (d->m_baseInstance == baseInstance)
+    if (d->m_firstInstance == firstInstance)
         return;
 
-    d->m_baseInstance = baseInstance;
-    emit baseInstanceChanged(baseInstance);
+    d->m_firstInstance = firstInstance;
+    emit firstInstanceChanged(firstInstance);
 }
 
-void QGeometryRenderer::setRestartIndex(int index)
+void QGeometryRenderer::setRestartIndexValue(int index)
 {
     Q_D(QGeometryRenderer);
-    if (index == d->m_restartIndex)
+    if (index == d->m_restartIndexValue)
         return;
 
-    d->m_restartIndex = index;
-    emit restartIndexChanged(index);
+    d->m_restartIndexValue = index;
+    emit restartIndexValueChanged(index);
 }
 
 void QGeometryRenderer::setVerticesPerPatch(int verticesPerPatch)
@@ -341,14 +341,14 @@ void QGeometryRenderer::setVerticesPerPatch(int verticesPerPatch)
     }
 }
 
-void QGeometryRenderer::setPrimitiveRestart(bool enabled)
+void QGeometryRenderer::setPrimitiveRestartEnabled(bool enabled)
 {
     Q_D(QGeometryRenderer);
     if (enabled == d->m_primitiveRestart)
         return;
 
     d->m_primitiveRestart = enabled;
-    emit primitiveRestartChanged(enabled);
+    emit primitiveRestartEnabledChanged(enabled);
 }
 
 void QGeometryRenderer::setGeometry(QGeometry *geometry)
@@ -415,10 +415,10 @@ void QGeometryRenderer::copy(const QNode *ref)
     QComponent::copy(ref);
     const QGeometryRenderer *other = static_cast<const QGeometryRenderer *>(ref);
     d_func()->m_instanceCount = other->d_func()->m_instanceCount;
-    d_func()->m_primitiveCount = other->d_func()->m_primitiveCount;
-    d_func()->m_baseVertex = other->d_func()->m_baseVertex;
-    d_func()->m_baseInstance = other->d_func()->m_baseInstance;
-    d_func()->m_restartIndex = other->d_func()->m_restartIndex;
+    d_func()->m_vertexCount = other->d_func()->m_vertexCount;
+    d_func()->m_indexOffset = other->d_func()->m_indexOffset;
+    d_func()->m_firstInstance = other->d_func()->m_firstInstance;
+    d_func()->m_restartIndexValue = other->d_func()->m_restartIndexValue;
     d_func()->m_primitiveRestart = other->d_func()->m_primitiveRestart;
     d_func()->m_primitiveType = other->d_func()->m_primitiveType;
     d_func()->m_verticesPerPatch = other->d_func()->m_verticesPerPatch;
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 836a1cc0e..8644ff661 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -57,12 +57,12 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged)
-    Q_PROPERTY(int primitiveCount READ primitiveCount WRITE setPrimitiveCount NOTIFY primitiveCountChanged)
-    Q_PROPERTY(int baseVertex READ baseVertex WRITE setBaseVertex NOTIFY baseVertexChanged)
-    Q_PROPERTY(int baseInstance READ baseInstance WRITE setBaseInstance NOTIFY baseInstanceChanged)
-    Q_PROPERTY(int restartIndex READ restartIndex WRITE setRestartIndex NOTIFY restartIndexChanged)
+    Q_PROPERTY(int vertexCount READ vertexCount WRITE setVertexCount NOTIFY vertexCountChanged)
+    Q_PROPERTY(int indexOffset READ indexOffset WRITE setIndexOffset NOTIFY indexOffsetChanged)
+    Q_PROPERTY(int firstInstance READ firstInstance WRITE setFirstInstance NOTIFY firstInstanceChanged)
+    Q_PROPERTY(int restartIndexValue READ restartIndexValue WRITE setRestartIndexValue NOTIFY restartIndexValueChanged)
     Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged)
-    Q_PROPERTY(bool primitiveRestart READ primitiveRestart WRITE setPrimitiveRestart NOTIFY primitiveRestartChanged)
+    Q_PROPERTY(bool primitiveRestartEnabled READ primitiveRestartEnabled WRITE setPrimitiveRestartEnabled NOTIFY primitiveRestartEnabledChanged)
     Q_PROPERTY(Qt3DRender::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
     Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged)
 
@@ -90,12 +90,12 @@ public:
     // also how to figure out which attribute(s?) hold the indices?
 
     int instanceCount() const;
-    int primitiveCount() const;
-    int baseVertex() const;
-    int baseInstance() const;
-    int restartIndex() const;
+    int vertexCount() const;
+    int indexOffset() const;
+    int firstInstance() const;
+    int restartIndexValue() const;
     int verticesPerPatch() const;
-    bool primitiveRestart() const;
+    bool primitiveRestartEnabled() const;
     QGeometry *geometry() const;
     PrimitiveType primitiveType() const;
 
@@ -104,23 +104,23 @@ public:
 
 public Q_SLOTS:
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
     void setVerticesPerPatch(int verticesPerPatch);
-    void setPrimitiveRestart(bool enabled);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 
 Q_SIGNALS:
     void instanceCountChanged(int instanceCount);
-    void primitiveCountChanged(int primitiveCount);
-    void baseVertexChanged(int baseVertex);
-    void baseInstanceChanged(int baseInstance);
-    void restartIndexChanged(int restartIndex);
+    void vertexCountChanged(int vertexCount);
+    void indexOffsetChanged(int indexOffset);
+    void firstInstanceChanged(int firstInstance);
+    void restartIndexValueChanged(int restartIndexValue);
     void verticesPerPatchChanged(int verticesPerPatch);
-    void primitiveRestartChanged(bool primitiveRestart);
+    void primitiveRestartEnabledChanged(bool primitiveRestartEnabled);
     void geometryChanged(QGeometry *geometry);
     void primitiveTypeChanged(PrimitiveType primitiveType);
 
diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index 359819349..6acf9ef79 100644
--- a/src/render/geometry/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
@@ -66,10 +66,10 @@ public:
     Q_DECLARE_PUBLIC(QGeometryRenderer)
 
     int m_instanceCount;
-    int m_primitiveCount;
-    int m_baseVertex;
-    int m_baseInstance;
-    int m_restartIndex;
+    int m_vertexCount;
+    int m_indexOffset;
+    int m_firstInstance;
+    int m_restartIndexValue;
     int m_verticesPerPatch;
     bool m_primitiveRestart;
     QGeometry *m_geometry;
diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h
index 1eabb87a1..5cb4686ca 100644
--- a/src/render/geometry/qplanemesh.h
+++ b/src/render/geometry/qplanemesh.h
@@ -78,11 +78,11 @@ private:
     // to modify the QGeometryRenderer's properties
 
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };
diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h
index 5558579e6..a3218bc1d 100644
--- a/src/render/geometry/qspheremesh.h
+++ b/src/render/geometry/qspheremesh.h
@@ -82,11 +82,11 @@ private:
     // As this is a default provided geometry renderer, no one should be able
     // to modify the QGeometryRenderer's properties
 
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };
diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h
index de7af8474..b41f6449c 100644
--- a/src/render/geometry/qtorusmesh.h
+++ b/src/render/geometry/qtorusmesh.h
@@ -80,11 +80,11 @@ private:
     // to modify the QGeometryRenderer's properties
 
     void setInstanceCount(int instanceCount);
-    void setPrimitiveCount(int primitiveCount);
-    void setBaseVertex(int baseVertex);
-    void setBaseInstance(int baseInstance);
-    void setRestartIndex(int index);
-    void setPrimitiveRestart(bool enabled);
+    void setVertexCount(int vertexCount);
+    void setIndexOffset(int indexOffset);
+    void setFirstInstance(int firstInstance);
+    void setRestartIndexValue(int index);
+    void setPrimitiveRestartEnabled(bool enabled);
     void setGeometry(QGeometry *geometry);
     void setPrimitiveType(PrimitiveType primitiveType);
 };