diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-06-29 12:16:52 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-07-03 23:14:18 +0200 |
| commit | 56d828078cd1e874b7fa0ac3ff2aa6ab705db927 (patch) | |
| tree | acba0bf954c7ec50c2d163dba4fca3100c5e50f8 /tests | |
| parent | fd7536a6e4cfaee8e52c9c6411601aed745fe5f6 (diff) | |
RenderQueue: switch to std::vector
Change-Id: I49ab3985ee01e40950bcd981dc77139a28f8db6a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/commons/testrenderer.h | 3 | ||||
| -rw-r--r-- | tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/manual-renderloop/main.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index 9f9837198..11be92153 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -59,8 +59,7 @@ public: void initialize() override {} void shutdown() override {} void releaseGraphicsResources() override {} - void render() override {} - void doRender(bool swapBuffers) override { Q_UNUSED(swapBuffers); } + void render(bool swapBuffers) override { Q_UNUSED(swapBuffers); } void cleanGraphicsResources() override {} bool isRunning() const override { return true; } bool shouldRender() const override { return true; } diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp index 728648a3c..bb39f235d 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp @@ -111,7 +111,7 @@ void tst_RenderQueue::checkOrder() } // THEN - QVector<Qt3DRender::Render::OpenGL::RenderView *> frame = renderQueue.nextFrameQueue(); + const std::vector<Qt3DRender::Render::OpenGL::RenderView *> &frame = renderQueue.nextFrameQueue(); for (int i = 0; i < 7; ++i) { QVERIFY(frame[i] == renderViews[i]); } diff --git a/tests/manual/manual-renderloop/main.cpp b/tests/manual/manual-renderloop/main.cpp index 274575b48..7c7d525a4 100644 --- a/tests/manual/manual-renderloop/main.cpp +++ b/tests/manual/manual-renderloop/main.cpp @@ -102,7 +102,7 @@ public: // Submit Render Queues Qt3DRender::QRenderAspectPrivate *dRenderAspect = static_cast<decltype(dRenderAspect)> (Qt3DRender::QRenderAspectPrivate::get(m_renderAspect)); - dRenderAspect->renderSynchronous(true); + dRenderAspect->render(true); } private: |