diff options
| author | Svenn-Arne Dragly <svenn-arne.dragly@qt.io> | 2017-11-15 09:08:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 12:55:31 +0100 |
| commit | cda9cecde58ce6734c58fb5e545d62c3e7e12a3d (patch) | |
| tree | 4c74e5d596b7a8b8ac026e718c2ce951f5dadaaf /tests/auto/render/renderviewbuilder | |
| parent | 57dc68b56858a1f9892319e8789169b2953c4c6e (diff) | |
| parent | e20de2c1fd9d2c022e85c45885585ddc52bd0219 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/render/backend/abstractrenderer_p.h
src/render/backend/layer.cpp
src/render/backend/layer_p.h
src/render/backend/render-backend.pri
src/render/backend/renderer_p.h
src/render/backend/renderviewbuilder.cpp
tests/auto/render/renderer/tst_renderer.cpp
tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp
Change-Id: I5c1b649052992e1b3483d549ddc188c8450e927f
Diffstat (limited to 'tests/auto/render/renderviewbuilder')
| -rw-r--r-- | tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp index b781ff04d..7a29c3ebd 100644 --- a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp @@ -199,6 +199,10 @@ private Q_SLOTS: QCOMPARE(renderViewBuilder.renderViewBuilderJobs().size(), Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); QCOMPARE(renderViewBuilder.materialGathererJobs().size(), Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 11 + 2 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + + // mark jobs dirty and recheck + testAspect.renderer()->markDirty(Qt3DRender::Render::AbstractRenderer::LayersDirty, nullptr); QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 12 + 2 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); } |