Switch to std::vector in QRenderAspect backend and OpenGL renderer

Change-Id: I91dd69fc205401b12f333a9a0534d9612c8e24f8
Reviewed-by: Mike Krus <mike.krus@kdab.com>

4 files changed, 22 insertions, 16 deletions

diff --git a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp
index 08967ead9..7cfcd3e23 100644
--- a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp
+++ b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp
@@ -88,8 +88,8 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(filterJob.filteredEntities().size(), 2);
-            QCOMPARE(filterJob.filteredEntities().first()->peerId(), childEntity1->id());
-            QCOMPARE(filterJob.filteredEntities().last()->peerId(), childEntity2->id());
+            QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id());
+            QCOMPARE(filterJob.filteredEntities().back()->peerId(), childEntity2->id());
         }
 
         {
@@ -100,7 +100,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(filterJob.filteredEntities().size(), 1);
-            QCOMPARE(filterJob.filteredEntities().first()->peerId(), childEntity1->id());
+            QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id());
         }
 
         {
@@ -121,7 +121,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(filterJob.filteredEntities().size(), 1);
-            QCOMPARE(filterJob.filteredEntities().first()->peerId(), childEntity3->id());
+            QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity3->id());
         }
     }
 };
diff --git a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
index 96e490752..24f6e5cbb 100644
--- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
+++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp
@@ -650,10 +650,10 @@ private Q_SLOTS:
         filterJob.run();
 
         // THEN
-        const QVector<Qt3DRender::Render::Entity *> filterEntities = filterJob.filteredEntities();
-        QCOMPARE(filterEntities.size(), expectedSelectedEntities.size());
-        for (auto i = 0, m = expectedSelectedEntities.size(); i < m; ++i)
-            QCOMPARE(filterEntities.at(i)->peerId(), expectedSelectedEntities.at(i));
+        const std::vector<Qt3DRender::Render::Entity *> filterEntities = std::move(filterJob.filteredEntities());
+        QCOMPARE(filterEntities.size(), size_t(expectedSelectedEntities.size()));
+        for (size_t i = 0, m = expectedSelectedEntities.size(); i < m; ++i)
+            QCOMPARE(filterEntities[i]->peerId(), expectedSelectedEntities[i]);
     }
 };
 
diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
index f29af93c5..846d21828 100644
--- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
+++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
@@ -476,8 +476,9 @@ private Q_SLOTS:
         renderer->lightGathererJob()->run();
 
         // THEN
-        QCOMPARE(renderer->lightGathererJob()->lights().size(), 2);
-        QVERIFY(renderer->lightGathererJob()->environmentLight() != nullptr);
+        Qt3DRender::Render::OpenGL::RendererCache *cache = renderer->cache();
+        QCOMPARE(cache->gatheredLights.size(), 2);
+        QVERIFY(cache->environmentLight != nullptr);
     }
 
     void checkRenderableEntitiesFilteringExecution()
@@ -496,7 +497,8 @@ private Q_SLOTS:
         renderer->renderableEntityFilterJob()->run();
 
         // THEN
-        QCOMPARE(renderer->renderableEntityFilterJob()->filteredEntities().size(), 1);
+        Qt3DRender::Render::OpenGL::RendererCache *cache = renderer->cache();
+        QCOMPARE(cache->renderableEntities.size(), 1);
     }
 
     void checkComputableEntitiesFilteringExecution()
@@ -515,7 +517,8 @@ private Q_SLOTS:
         renderer->computableEntityFilterJob()->run();
 
         // THEN
-        QCOMPARE(renderer->computableEntityFilterJob()->filteredEntities().size(), 1);
+        Qt3DRender::Render::OpenGL::RendererCache *cache = renderer->cache();
+        QCOMPARE(cache->computeEntities.size(), 1);
     }
 
     void checkSyncRenderViewInitializationExecution()
@@ -653,8 +656,9 @@ private Q_SLOTS:
         renderViewBuilder.syncRenderViewPostInitializationJob()->run();
         renderViewBuilder.filterEntityByLayerJob()->run();
 
-        QVector<Qt3DRender::Render::Entity *> renderableEntity = renderer->renderableEntityFilterJob()->filteredEntities();
-        QVector<Qt3DRender::Render::Entity *> filteredEntity = renderViewBuilder.filterEntityByLayerJob()->filteredEntities();
+        Qt3DRender::Render::OpenGL::RendererCache *cache = renderer->cache();
+        std::vector<Qt3DRender::Render::Entity *> renderableEntity = cache->renderableEntities;
+        std::vector<Qt3DRender::Render::Entity *> filteredEntity = renderViewBuilder.filterEntityByLayerJob()->filteredEntities();
 
         // THEN
         QCOMPARE(renderableEntity.size(), 200);
@@ -668,7 +672,9 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(renderableEntity.size(), 100);
         for (const auto entity : renderableEntity) {
-            QVERIFY(filteredEntity.contains(entity));
+            QVERIFY(std::find(filteredEntity.begin(),
+                              filteredEntity.end(),
+                              entity) != filteredEntity.end());
         }
     }
 
diff --git a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
index a64f5de71..f55e7cc0f 100644
--- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
+++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
@@ -328,7 +328,7 @@ private Q_SLOTS:
         filterJob.run();
 
         // THEN
-        const QVector<Qt3DRender::Render::Entity *> filterEntities = filterJob.filteredEntities();
+        const std::vector<Qt3DRender::Render::Entity *> &filterEntities = filterJob.filteredEntities();
         QCOMPARE(filterEntities.size(), expectedSelectedEntities.size());
 
         for (auto i = 0, m = expectedSelectedEntities.size(); i < m; ++i)